Merge remote-tracking branches 'asoc/topic/adsp' and 'asoc/topic/atmel' into asoc...

[karo-tx-linux.git] / sound / usb / format.c

diff --git a/sound/usb/format.c b/sound/usb/format.c
index 8bcc87cf5667efbebc164e000f07cae23fc2a4c2..789d19ec035daf4aab2e2094d1952be71e25f822 100644 (file)
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -79,7 +79,10 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip,
                format = 1 << UAC_FORMAT_TYPE_I_PCM;
        }
        if (format & (1 << UAC_FORMAT_TYPE_I_PCM)) {
-               if (chip->usb_id == USB_ID(0x0582, 0x0016) /* Edirol SD-90 */ &&
+               if (((chip->usb_id == USB_ID(0x0582, 0x0016)) ||
+                    /* Edirol SD-90 */
+                    (chip->usb_id == USB_ID(0x0582, 0x000c))) &&
+                    /* Roland SC-D70 */
                    sample_width == 24 && sample_bytes == 2)
                        sample_bytes = 3;
                else if (sample_width > sample_bytes * 8) {