diff options
| author | Eldad Zack <eldad@fogrefinery.com> | 2013-10-06 22:31:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-07 10:52:13 +0200 |
| commit | 26de5d0a8df0817a58422f6ad43019c47716ce1f (patch) | |
| tree | 88dbe768ba5be50cc89f414188d6edf793956e1d /sound/usb/pcm.c | |
| parent | 93721039903eab4a3d406e6fb095e2598093bc9c (diff) | |
| download | linux-26de5d0a8df0817a58422f6ad43019c47716ce1f.tar.gz linux-26de5d0a8df0817a58422f6ad43019c47716ce1f.tar.bz2 linux-26de5d0a8df0817a58422f6ad43019c47716ce1f.zip | |
ALSA: usb-audio: remove deactivate_endpoints()
The only call site for deactivate_endpoints() at snd_usb_hw_free().
The return value is not checked there, as it is irrelevant if it
fails on hw_free.
This patch moves the deactivation of the endpoints directly into
snd_usb_hw_free().
Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/pcm.c')
| -rw-r--r-- | sound/usb/pcm.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 19e79953f2e3..1a9a01853688 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -282,22 +282,6 @@ static void stop_endpoints(struct snd_usb_substream *subs, bool wait) } } -static int deactivate_endpoints(struct snd_usb_substream *subs) -{ - int reta, retb; - - reta = snd_usb_endpoint_deactivate(subs->sync_endpoint); - retb = snd_usb_endpoint_deactivate(subs->data_endpoint); - - if (reta < 0) - return reta; - - if (retb < 0) - return retb; - - return 0; -} - static int search_roland_implicit_fb(struct usb_device *dev, int ifnum, unsigned int altsetting, struct usb_host_interface **alts, @@ -736,7 +720,8 @@ static int snd_usb_hw_free(struct snd_pcm_substream *substream) down_read(&subs->stream->chip->shutdown_rwsem); if (!subs->stream->chip->shutdown) { stop_endpoints(subs, true); - deactivate_endpoints(subs); + snd_usb_endpoint_deactivate(subs->sync_endpoint); + snd_usb_endpoint_deactivate(subs->data_endpoint); } up_read(&subs->stream->chip->shutdown_rwsem); return snd_pcm_lib_free_vmalloc_buffer(substream); |