From: Eldad Zack <eldad@fogrefinery.com>
Date: Sun, 6 Oct 2013 20:31:09 +0000 (+0200)
Subject: ALSA: usb-audio: don't deactivate URBs on in-use EP
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=239b9f7990873d851335ed23fa091ce1484a5bcc;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

ALSA: usb-audio: don't deactivate URBs on in-use EP

If an endpoint in use, its associated URBs should not be
deactivated.

Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index 5dd51af0525a..e84732c874cb 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -959,12 +959,12 @@ int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep)
 	if (!ep)
 		return -EINVAL;
 
-	deactivate_urbs(ep, true);
-	wait_clear_urbs(ep);
-
 	if (ep->use_count != 0)
 		return 0;
 
+	deactivate_urbs(ep, true);
+	wait_clear_urbs(ep);
+
 	clear_bit(EP_FLAG_ACTIVATED, &ep->flags);
 
 	return 0;