| Message ID | 20141108003803.6561.42934.stgit@notabene.brown (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index b6b0cb399599..c873f5887486 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -957,6 +957,12 @@ static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); + int val = ucontrol->value.integer.value[0]; + + if (!!(twl4030_read(codec, TWL4030_REG_CODEC_MODE) + & TWL4030_OPTION_1) == !!val) + /* No change */ + return 0; if (twl4030->configured) { dev_err(codec->dev,
"mode" must not be changed when active. However if a request is received to set the mode to what it currently is, that is also rejected when active, which causes confusing error messages. So check first and if no change is actually requested, don't report an error. Signed-off-by: NeilBrown <neilb@suse.de> --- sound/soc/codecs/twl4030.c | 6 ++++++ 1 file changed, 6 insertions(+)