diff options
| author | Thibault Le Meur <Thibault.LeMeur@supelec.fr> | 2007-07-12 11:26:35 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-07-20 11:11:50 +0200 |
| commit | f8c78b82b9e47d933629e7060e4a83a277b15ffe (patch) | |
| tree | bebe05fcce9dc70f5b6fea2459e3950ca909b1e0 /sound/usb | |
| parent | be38114a49853e441e694d690e631937de5fc524 (diff) | |
| download | linux-f8c78b82b9e47d933629e7060e4a83a277b15ffe.tar.gz linux-f8c78b82b9e47d933629e7060e4a83a277b15ffe.tar.bz2 linux-f8c78b82b9e47d933629e7060e4a83a277b15ffe.zip | |
[ALSA] usb-audio - Fix audiophile-USB quirk for little-endian
Audiophile-usb fix (corrects little-endianness in 16bit
modes, resets interfaces at device initialization, and updates the
documentation).
Signed-off-by: Thibault Le Meur <Thibault.LeMeur@supelec.fr>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/usbaudio.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 8ebc1adb5ed9..834b0aff5ec1 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -2350,7 +2350,9 @@ static int is_big_endian_format(struct snd_usb_audio *chip, struct audioformat * return 1; break; case USB_ID(0x0763, 0x2003): /* M-Audio Audiophile USB */ - return 1; + if (device_setup[chip->index] == 0x00 || + fp->altsetting==1 || fp->altsetting==2 || fp->altsetting==3) + return 1; } return 0; } @@ -3251,6 +3253,11 @@ static int snd_usb_cm106_boot_quirk(struct usb_device *dev) static int audiophile_skip_setting_quirk(struct snd_usb_audio *chip, int iface, int altno) { + /* Reset ALL ifaces to 0 altsetting. + * Call it for every possible altsetting of every interface. + */ + usb_set_interface(chip->dev, iface, 0); + if (device_setup[chip->index] & AUDIOPHILE_SET) { if ((device_setup[chip->index] & AUDIOPHILE_SET_DTS) && altno != 6) |