summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wl1273.c
diff options
context:
space:
mode:
authorMatti J. Aaltonen <matti.j.aaltonen@nokia.com>2010-09-10 11:41:30 +0400
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-09-11 12:03:21 +0400
commit2c4ee9b579d17006ad9a83f13e3ae15c142dc41e (patch)
treede8110cd424c8b41631a52db2e34411f6404854b /sound/soc/codecs/wl1273.c
parentc23fd751dc2953263be5989ca537fdee14dee46e (diff)
downloadlinux-2c4ee9b579d17006ad9a83f13e3ae15c142dc41e.tar.xz
ASoC: WL1273 FM Radio: Eliminate unnecessary error return value.
With this change it's not a error to call wl1273_set_audio_route when the codec is active if the new routing value is the same as the current active setting. Signed-off-by: Matti J. Aaltonen <matti.j.aaltonen@nokia.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/codecs/wl1273.c')
-rw-r--r--sound/soc/codecs/wl1273.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index 0cd590970883..0c47c788ccdf 100644
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -193,6 +193,9 @@ static int snd_wl1273_set_audio_route(struct snd_kcontrol *kcontrol,
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct wl1273_priv *wl1273 = snd_soc_codec_get_drvdata(codec);
+ if (wl1273->mode == ucontrol->value.integer.value[0])
+ return 0;
+
/* Do not allow changes while stream is running */
if (codec->active)
return -EPERM;