[ALSA] missing error check in usb sound driver

[linux-2.6-omap-h63xx.git] / sound / usb / usbquirks.h

diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 5a2f518c66295d7dcab60453969959065cf09d12..20a2f6ef43266822a2c30d6f5a42c5fbd453bf27 100644 (file)
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -1254,7 +1254,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
        /* TODO: add Edirol PC-80 support */
-       /* TODO: add Edirol UA-1EX support */
+{
+       USB_DEVICE(0x0582, 0x0096),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "EDIROL",
+               .product_name = "UA-1EX",
+               .ifnum = QUIRK_ANY_INTERFACE,
+               .type = QUIRK_COMPOSITE,
+               .data = (const struct snd_usb_audio_quirk[]) {
+                       {
+                               .ifnum = 0,
+                               .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                       },
+                       {
+                               .ifnum = 1,
+                               .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                       },
+                       {
+                               .ifnum = -1
+                       }
+               }
+       }
+},
 {
        USB_DEVICE(0x0582, 0x009a),
        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
@@ -1709,6 +1730,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 
+/* Stanton/N2IT Final Scratch v1 device ('Scratchamp') */
+{
+       USB_DEVICE(0x103d, 0x0100),
+               .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "Stanton",
+               .product_name = "ScratchAmp",
+               .ifnum = QUIRK_NO_INTERFACE
+       }
+},
+{
+       USB_DEVICE(0x103d, 0x0101),
+               .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+               .vendor_name = "Stanton",
+               .product_name = "ScratchAmp",
+               .ifnum = QUIRK_NO_INTERFACE
+       }
+},
+
 /* Novation EMS devices */
 {
        USB_DEVICE_VENDOR_SPEC(0x1235, 0x0001),
@@ -1738,6 +1777,16 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 
+{
+       /* Serato Scratch Live DJ Box */
+       USB_DEVICE(0x13e5, 0x0001),
+       .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk)
+       {
+               .ifnum = QUIRK_ANY_INTERFACE,
+               .type = QUIRK_AUDIO_STANDARD_INTERFACE
+       }
+},
+
 /* Miditech devices */
 {
        USB_DEVICE(0x4752, 0x0011),