diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-17 15:22:50 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-17 15:22:50 +0400 |
| commit | 8eb41582d2106eccc7717047d1184481f5a1b3a6 (patch) | |
| tree | 12257bbe39b5c8ae6918198fde682ed0aacd8e00 /sound/usb/card.c | |
| parent | 127d4eb97b7bebc15fd692603263e75c220e24f9 (diff) | |
| parent | 1cb17e2dbd09436069733500ea48e0c9b1f0a1cc (diff) | |
| download | linux-8eb41582d2106eccc7717047d1184481f5a1b3a6.tar.xz | |
Merge branch 'ep93xx/board' into next/board
Diffstat (limited to 'sound/usb/card.c')
| -rw-r--r-- | sound/usb/card.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 781d9e61adfb..d8f2bf401458 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -530,8 +530,11 @@ snd_usb_audio_probe(struct usb_device *dev, return chip; __error: - if (chip && !chip->num_interfaces) - snd_card_free(chip->card); + if (chip) { + if (!chip->num_interfaces) + snd_card_free(chip->card); + chip->probing = 0; + } mutex_unlock(®ister_mutex); __err_val: return NULL; |