Commit 5875c2cb authored by Daniel Mack's avatar Daniel Mack Committed by Takashi Iwai

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

This is needed for upcoming changes to the quirks mechanism.
Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d2859fd4
...@@ -492,14 +492,6 @@ static void *snd_usb_audio_probe(struct usb_device *dev, ...@@ -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, ...@@ -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 ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment