diff options
| -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 a90662af2d6b..84a5ce70a2b0 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, | |||
| 492 | } | 492 | } |
| 493 | } | 493 | } |
| 494 | 494 | ||
| 495 | chip->txfr_quirk = 0; | ||
| 496 | err = 1; /* continue */ | ||
| 497 | if (quirk && quirk->ifnum != QUIRK_NO_INTERFACE) { | ||
| 498 | /* need some special handlings */ | ||
| 499 | if ((err = snd_usb_create_quirk(chip, intf, &usb_audio_driver, quirk)) < 0) | ||
| 500 | goto __error; | ||
| 501 | } | ||
| 502 | |||
| 503 | /* | 495 | /* |
| 504 | * For devices with more than one control interface, we assume the | 496 | * For devices with more than one control interface, we assume the |
| 505 | * first contains the audio controls. We might need a more specific | 497 | * 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 | if (!chip->ctrl_intf) | 500 | if (!chip->ctrl_intf) |
| 509 | chip->ctrl_intf = alts; | 501 | chip->ctrl_intf = alts; |
| 510 | 502 | ||
| 503 | chip->txfr_quirk = 0; | ||
| 504 | err = 1; /* continue */ | ||
| 505 | if (quirk && quirk->ifnum != QUIRK_NO_INTERFACE) { | ||
| 506 | /* need some special handlings */ | ||
| 507 | if ((err = snd_usb_create_quirk(chip, intf, &usb_audio_driver, quirk)) < 0) | ||
| 508 | goto __error; | ||
| 509 | } | ||
| 510 | |||
| 511 | if (err > 0) { | 511 | if (err > 0) { |
| 512 | /* create normal USB audio interfaces */ | 512 | /* create normal USB audio interfaces */ |
| 513 | if (snd_usb_create_streams(chip, ifnum) < 0 || | 513 | if (snd_usb_create_streams(chip, ifnum) < 0 || |
