svn commit: r242129 - head/sys/dev/sound/usb

[Hans Petter Selasky]

Author: hselasky
Date: Fri Oct 26 12:41:01 2012
New Revision: 242129
URL: http://svn.freebsd.org/changeset/base/242129

Log:
  Make sure the vendor class quirk only matches the vendor specific
  class, else multiple pcm devices can appear on certain USB audio
  devices.
  
  MFC after:	1 week

Modified:
  head/sys/dev/sound/usb/uaudio.c

Modified: head/sys/dev/sound/usb/uaudio.c
==============================================================================
--- head/sys/dev/sound/usb/uaudio.c	Fri Oct 26 12:24:38 2012	(r242128)
+++ head/sys/dev/sound/usb/uaudio.c	Fri Oct 26 12:41:01 2012	(r242129)
@@ -618,7 +618,8 @@ uaudio_probe(device_t dev)
 	/* lookup non-standard device */
 
 	if (uaa->info.bInterfaceClass != UICLASS_AUDIO) {
-		if (usb_test_quirk(uaa, UQ_AU_VENDOR_CLASS) == 0)
+		if (uaa->info.bInterfaceClass != UICLASS_VENDOR ||
+		    usb_test_quirk(uaa, UQ_AU_VENDOR_CLASS) == 0)
 			return (ENXIO);
 	}