summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2016-01-24 00:36:40 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-30 10:19:27 +0200
commitbfba69dc30abfe54f4f424ad40065a6b429308a6 (patch)
treea9c30f0bfa2d199fd0424325a901abd6d4d875a9 /sound
parenteb2ba09b05a6cdb521b32305890772e618f04783 (diff)
downloadlinux-stable-bfba69dc30abfe54f4f424ad40065a6b429308a6.tar.gz
linux-stable-bfba69dc30abfe54f4f424ad40065a6b429308a6.tar.bz2
linux-stable-bfba69dc30abfe54f4f424ad40065a6b429308a6.zip
ASoC: simple-card: don't fail if sysclk setting is not supported
commit ee43a1a0cd2a8f33cddfa1323a60b5cfcf865ba0 upstream. Commit e22579713ae1 ("ASoC: simple card: set cpu-dai sysclk with mclk-fs") added sysclk / SND_SOC_CLOCK_OUT setting, that makes asoc_simple_card_hw_params fail if the operation is not supported, although the intention clearly was to ignore ENOTSUPP. Fix it. The patch fixes audio playback on Kirkwood / OpenRD client, where the following errors are seen: asoc-simple-card sound: ASoC: machine hw_params failed: -524 alsa-lib: /alsa-lib-1.0.28/src/pcm/pcm_hw.c:327:(snd_pcm_hw_hw_params) SNDRV_PCM_IOCTL_HW_PARAMS failed (-524): Unknown error 524 Fixes: e22579713ae1 ("ASoC: simple card: set cpu-dai sysclk with mclk-fs") Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Thong Ho <thong.ho.px@rvc.renesas.com> Signed-off-by: Nhan Nguyen <nhan.nguyen.yb@renesas.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/generic/simple-card.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 54c33204541f..ff6fcd9f92f7 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -100,7 +100,7 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream,
if (ret && ret != -ENOTSUPP)
goto err;
}
-
+ return 0;
err:
return ret;
}