Merge branch 'pm-runtime' into pm-for-linus

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / sound / usb / card.c

diff --git a/sound/usb/card.c b/sound/usb/card.c
index d5754fa5e551eee063e34b2479671a8f02fde94c..3068f043099a8112f4117f00653da738e88a638b 100644 (file)
--- 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(&register_mutex);
  __err_val:
        return NULL;