summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2019-09-10 22:51:51 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-05 13:14:00 +0200
commit75c1a117e1f779f541aea3463050f6eb66ca2288 (patch)
tree4354028cb0f64e4ee957abdb5cd025b6267aea06 /sound
parent77567ebc406005e2ff88e0e195e3a1589485c7c8 (diff)
downloadlinux-stable-75c1a117e1f779f541aea3463050f6eb66ca2288.tar.gz
linux-stable-75c1a117e1f779f541aea3463050f6eb66ca2288.tar.bz2
linux-stable-75c1a117e1f779f541aea3463050f6eb66ca2288.zip
ALSA: firewire-tascam: handle error code when getting current source of clock
commit 2617120f4de6d0423384e0e86b14c78b9de84d5a upstream. The return value of snd_tscm_stream_get_clock() is ignored. This commit checks the value and handle error. Fixes: e453df44f0d6 ("ALSA: firewire-tascam: add PCM functionality") Cc: <stable@vger.kernel.org> # v4.4+ Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Link: https://lore.kernel.org/r/20190910135152.29800-2-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/firewire/tascam/tascam-pcm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/firewire/tascam/tascam-pcm.c b/sound/firewire/tascam/tascam-pcm.c
index a8cd9b156488..67d8b80b471e 100644
--- a/sound/firewire/tascam/tascam-pcm.c
+++ b/sound/firewire/tascam/tascam-pcm.c
@@ -56,6 +56,9 @@ static int pcm_open(struct snd_pcm_substream *substream)
goto err_locked;
err = snd_tscm_stream_get_clock(tscm, &clock);
+ if (err < 0)
+ goto err_locked;
+
if (clock != SND_TSCM_CLOCK_INTERNAL ||
amdtp_stream_pcm_running(&tscm->rx_stream) ||
amdtp_stream_pcm_running(&tscm->tx_stream)) {