diff options
| author | Takashi Iwai | 2012-11-21 08:30:48 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2012-11-21 11:43:56 +0100 |
| commit | b2eb950de2f09435d5156f4dc6d5dbf284cd97f3 (patch) | |
| tree | 7d5724114c4f57503502a7dd4a86bc9573774669 /sound/usb/pcm.c | |
| parent | ALSA: usb-audio: simplify endpoint deactivation code (diff) | |
| download | kernel-qcow2-linux-b2eb950de2f09435d5156f4dc6d5dbf284cd97f3.tar.gz kernel-qcow2-linux-b2eb950de2f09435d5156f4dc6d5dbf284cd97f3.tar.xz kernel-qcow2-linux-b2eb950de2f09435d5156f4dc6d5dbf284cd97f3.zip | |
ALSA: usb-audio: stop both data and sync endpoints asynchronously
As we are stopping the endpoints asynchronously now, it's better to
trigger the stop of both data and sync endpoints and wait for pending
stopping operations, instead of the sequential trigger-and-wait
procedure.
So the wait argument in snd_usb_endpoint_stop() is dropped, and it's
expected that the caller synchronizes explicitly by calling
snd_usb_endpoint_sync_pending_stop(). (Actually there is only one
place calling this, so it was safe to change.)
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/pcm.c')
| -rw-r--r-- | sound/usb/pcm.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index d90604aa5137..4750d3d5c0cc 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -266,10 +266,15 @@ static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep) static void stop_endpoints(struct snd_usb_substream *subs, bool wait) { if (test_and_clear_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags)) - snd_usb_endpoint_stop(subs->sync_endpoint, wait); + snd_usb_endpoint_stop(subs->sync_endpoint); if (test_and_clear_bit(SUBSTREAM_FLAG_DATA_EP_STARTED, &subs->flags)) - snd_usb_endpoint_stop(subs->data_endpoint, wait); + snd_usb_endpoint_stop(subs->data_endpoint); + + if (wait) { + snd_usb_endpoint_sync_pending_stop(subs->sync_endpoint); + snd_usb_endpoint_sync_pending_stop(subs->data_endpoint); + } } static int deactivate_endpoints(struct snd_usb_substream *subs) |