Code Review / kvmfornfv.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git] / kernel / sound / usb / card.c
diff --git a/kernel/sound/usb/card.c b/kernel/sound/usb/card.c
index 1fab977..0450593 100644 (file)
--- a/kernel/sound/usb/card.c
+++ b/kernel/sound/usb/card.c
@@ -638,7 +638,7 @@ int snd_usb_autoresume(struct snd_usb_audio *chip)
        int err = -ENODEV;
 
        down_read(&chip->shutdown_rwsem);
-       if (chip->probing && chip->in_pm)
+       if (chip->probing || chip->in_pm)
                err = 0;
        else if (!chip->shutdown)
                err = usb_autopm_get_interface(chip->pm_intf);