| commit | dd212bd5bb8b15889821ef79213cdb5bd47c6f85 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Fri Nov 08 10:43:43 2013 +0000 |
| committer | Mark Brown <broonie@linaro.org> | Fri Nov 08 10:43:43 2013 +0000 |
| tree | 76544b0de597d75b2fad4a183f63408aba32186d | |
| parent | 22b468a06e5862c40a44798a335cb4956b78dbc0 [diff] | |
| parent | fe329a1a92cfe2d0c7e04fe3bc63761dc0f35950 [diff] |
Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-next
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index d666de0..1a7655b 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c
@@ -438,6 +438,8 @@ struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec); int block = wm8996_get_retune_mobile_block(kcontrol->id.name); + if (block < 0) + return block; ucontrol->value.enumerated.item[0] = wm8996->retune_mobile_cfg[block]; return 0;