summaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2017-01-03 11:58:33 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-15 13:42:56 +0100
commit2fc33ff4ba817484a5307a4b5ef352d20d7af746 (patch)
tree9b981c588f0424e8a28eb4c65b08757ab9abc6bb /sound/firewire
parent2c867216c555f5897b327daed6240bfb9e489c97 (diff)
downloadlinux-stable-2fc33ff4ba817484a5307a4b5ef352d20d7af746.tar.gz
linux-stable-2fc33ff4ba817484a5307a4b5ef352d20d7af746.tar.bz2
linux-stable-2fc33ff4ba817484a5307a4b5ef352d20d7af746.zip
ALSA: firewire-tascam: Fix to handle error from initialization of stream data
commit 6a2a2f45560a9cb7bc49820883b042e44f83726c upstream. This module has a bug not to return error code in a case that data structure for transmitted packets fails to be initialized. This commit fixes the bug. Fixes: 35efa5c489de ("ALSA: firewire-tascam: add streaming functionality") Signed-off-by: Takashi Sakamoto <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/firewire')
-rw-r--r--sound/firewire/tascam/tascam-stream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/tascam/tascam-stream.c b/sound/firewire/tascam/tascam-stream.c
index 4ad3bd7fd445..f1657a4e0621 100644
--- a/sound/firewire/tascam/tascam-stream.c
+++ b/sound/firewire/tascam/tascam-stream.c
@@ -343,7 +343,7 @@ int snd_tscm_stream_init_duplex(struct snd_tscm *tscm)
if (err < 0)
amdtp_stream_destroy(&tscm->rx_stream);
- return 0;
+ return err;
}
/* At bus reset, streaming is stopped and some registers are clear. */