Merge branch 'topic/usb-fix' into for-linus

diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 92115755d98e7f8626651ebbf3af6782e60ccd0e..5d8ef09b9dcc17d01f85d2ca27047a7faa30fe4f 100644 (file)
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -128,6 +128,14 @@
        .bInterfaceClass = USB_CLASS_AUDIO,
        .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL
 },
+{
+       USB_DEVICE(0x046d, 0x0990),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "Logitech, Inc.",
+               .product_name = "QuickCam Pro 9000",
+               .ifnum = QUIRK_NO_INTERFACE
+       }
+},
 
 /*
  * Yamaha devices