evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: usb-audio: move assignment of chip->ctrl_intf

Browse source 
This is needed for upcoming changes to the quirks mechanism.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Daniel Mack 2011-05-25 09:08:59 +02:00 • committed by Takashi Iwai
parent d2859fd492
commit 5875c2cb76
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sound/usb/card.c
View file

@ -492,14 +492,6 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
} }
} }
chip->txfr_quirk = 0;
err = 1; /* continue */
if (quirk && quirk->ifnum != QUIRK_NO_INTERFACE) {
/* need some special handlings */
if ((err = snd_usb_create_quirk(chip, intf, &usb_audio_driver, quirk)) < 0)
goto __error;
}
/* /*
* For devices with more than one control interface, we assume the * For devices with more than one control interface, we assume the
* first contains the audio controls. We might need a more specific * first contains the audio controls. We might need a more specific
@ -508,6 +500,14 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
if (!chip->ctrl_intf) if (!chip->ctrl_intf)
chip->ctrl_intf = alts; chip->ctrl_intf = alts;
chip->txfr_quirk = 0;
err = 1; /* continue */
if (quirk && quirk->ifnum != QUIRK_NO_INTERFACE) {
/* need some special handlings */
if ((err = snd_usb_create_quirk(chip, intf, &usb_audio_driver, quirk)) < 0)
goto __error;
}
if (err > 0) { if (err > 0) {
/* create normal USB audio interfaces */ /* create normal USB audio interfaces */
if (snd_usb_create_streams(chip, ifnum) < 0 || if (snd_usb_create_streams(chip, ifnum) < 0 ||