diff --git a/[refs] b/[refs] index 5fa09f9412ac..4c126be6257b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05422575d4bc5d1a6aff22dfa9a0b5bc701ccf6f +refs/heads/master: 119c4ff52e5250a476054e6faca9a85422a0402b diff --git a/trunk/sound/usb/usbquirks.h b/trunk/sound/usb/usbquirks.h index edb88871ff4a..bb7829cf98dc 100644 --- a/trunk/sound/usb/usbquirks.h +++ b/trunk/sound/usb/usbquirks.h @@ -294,7 +294,8 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, { - /* a later revision uses ID 0x0099 */ + /* Has ID 0x0099 when not in "Advanced Driver" mode. + * The UM-2EX has only one input, but we cannot detect this. */ USB_DEVICE(0x0582, 0x0005), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { .vendor_name = "EDIROL", @@ -385,7 +386,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, { - /* a later revision uses ID 0x009d */ + /* has ID 0x009d when not in "Advanced Driver" mode */ USB_DEVICE(0x0582, 0x0009), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { .vendor_name = "EDIROL",