| commit | 71d0c3a876e007f68fc2ed433119dd4f4dc408a7 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Sun Nov 03 22:04:22 2013 -0800 |
| committer | Mark Brown <broonie@linaro.org> | Sun Nov 03 22:04:22 2013 -0800 |
| tree | e51d64b0629e6e61743888d65f69c3df006e8330 | |
| parent | f027ac7a72f6ad0bc1a138a2464a6b7af4436fb2 [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 46fe83d..b70379e 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;