]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ALSA] usb audio: Fix another Dallas quirk
authorPavel Machek <pavel@suse.cz>
Mon, 14 Apr 2008 11:12:47 +0000 (13:12 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 24 Apr 2008 10:00:33 +0000 (12:00 +0200)
Dallas USB speakers are buggy in more than one way. One of configs
they offer does not work at all.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/usbaudio.c

index 5c40c031dd579dfce297e74e76a9698229902e57..ff2e09a46133a5f1e2a2fe10f1d58c875379e5c4 100644 (file)
@@ -2676,12 +2676,23 @@ static int parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
        int format;
        struct audioformat *fp;
        unsigned char *fmt, *csep;
+       int num;
 
        dev = chip->dev;
 
        /* parse the interface's altsettings */
        iface = usb_ifnum_to_if(dev, iface_no);
-       for (i = 0; i < iface->num_altsetting; i++) {
+
+       num = iface->num_altsetting;
+
+       /*
+        * Dallas DS4201 workaround: It presents 5 altsettings, but the last
+        * one misses syncpipe, and does not produce any sound.
+        */
+       if (chip->usb_id == USB_ID(0x04fa, 0x4201))
+               num = 4;
+
+       for (i = 0; i < num; i++) {
                alts = &iface->altsetting[i];
                altsd = get_iface_desc(alts);
                /* skip invalid one */