diff options
| author | Eldad Zack <eldad@fogrefinery.com> | 2013-10-06 22:31:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-07 10:55:14 +0200 |
| commit | 239b9f7990873d851335ed23fa091ce1484a5bcc (patch) | |
| tree | 53fc931d4089dc91600b67d43f9db2d677653337 /sound/usb/endpoint.c | |
| parent | ALSA: usb-audio: remove deactivate_endpoints() (diff) | |
| download | linux-239b9f7990873d851335ed23fa091ce1484a5bcc.tar.xz linux-239b9f7990873d851335ed23fa091ce1484a5bcc.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | sound/usb/endpoint.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |