summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2018-01-06 21:18:24 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-12 12:32:17 +0200
commit87b9099cf14109b5369ba2fa5435e190efea793c (patch)
tree513ed60ebf88a3781f9f9ede38aa3e2b42d53e3a /sound/soc
parent89deb4ad015ba32da4d084347752220b23aaee06 (diff)
downloadlinux-stable-87b9099cf14109b5369ba2fa5435e190efea793c.tar.gz
linux-stable-87b9099cf14109b5369ba2fa5435e190efea793c.tar.bz2
linux-stable-87b9099cf14109b5369ba2fa5435e190efea793c.zip
ASoC: Intel: sst: Fix the return value of 'sst_send_byte_stream_mrfld()'
[ Upstream commit eaadb1caa966a91128297b754e90b7c92b350a00 ] In some error handling paths, an error code is assiegned to 'ret'. However, the function always return 0. Fix it and return the error code if such an error paths is taken. Fixes: 3d9ff34622ba ("ASoC: Intel: sst: add stream operations") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/intel/atom/sst/sst_stream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/atom/sst/sst_stream.c b/sound/soc/intel/atom/sst/sst_stream.c
index 83d8dda15233..4eeb9afdc89f 100644
--- a/sound/soc/intel/atom/sst/sst_stream.c
+++ b/sound/soc/intel/atom/sst/sst_stream.c
@@ -221,7 +221,7 @@ int sst_send_byte_stream_mrfld(struct intel_sst_drv *sst_drv_ctx,
sst_free_block(sst_drv_ctx, block);
out:
test_and_clear_bit(pvt_id, &sst_drv_ctx->pvt_id);
- return 0;
+ return ret;
}
/*