Skip to content

Commit

Permalink
ALSA: usb-audio: move assignment of chip->ctrl_intf
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Mack authored and Takashi Iwai committed May 25, 2011
1 parent d2859fd commit 5875c2c
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions sound/usb/card.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
* first contains the audio controls. We might need a more specific
Expand All @@ -508,6 +500,14 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
if (!chip->ctrl_intf)
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) {
/* create normal USB audio interfaces */
if (snd_usb_create_streams(chip, ifnum) < 0 ||
Expand Down

0 comments on commit 5875c2c

Please sign in to comment.