diff options
| author | Daniel Mack <zonque@gmail.com> | 2011-05-25 09:08:59 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-25 09:34:19 +0200 |
| commit | 5875c2cb7633ca280c2ece43389d6a6f3c00e951 (patch) | |
| tree | f92d1d204fb4df3ca6f4743252c9721f3856aa2b /sound/usb | |
| parent | d2859fd49200f1f3efd8acdb54b6d51d3ab82302 (diff) | |
| download | kernel_samsung_smdk4412-5875c2cb7633ca280c2ece43389d6a6f3c00e951.zip kernel_samsung_smdk4412-5875c2cb7633ca280c2ece43389d6a6f3c00e951.tar.gz kernel_samsung_smdk4412-5875c2cb7633ca280c2ece43389d6a6f3c00e951.tar.bz2 | |
ALSA: usb-audio: move assignment of chip->ctrl_intf
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>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/card.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index a90662a..84a5ce7 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -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 @@ -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 || |