diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-04 01:04:22 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-04 01:04:22 -0500 |
| commit | 71d0c3a876e007f68fc2ed433119dd4f4dc408a7 (patch) | |
| tree | e51d64b0629e6e61743888d65f69c3df006e8330 /sound/soc | |
| parent | f027ac7a72f6ad0bc1a138a2464a6b7af4436fb2 (diff) | |
| parent | fe329a1a92cfe2d0c7e04fe3bc63761dc0f35950 (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8996.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 46fe83d2b224..b70379ebd142 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c | |||
| @@ -438,6 +438,8 @@ static int wm8996_get_retune_mobile_enum(struct snd_kcontrol *kcontrol, | |||
| 438 | struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec); | 438 | struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec); |
| 439 | int block = wm8996_get_retune_mobile_block(kcontrol->id.name); | 439 | int block = wm8996_get_retune_mobile_block(kcontrol->id.name); |
| 440 | 440 | ||
| 441 | if (block < 0) | ||
| 442 | return block; | ||
| 441 | ucontrol->value.enumerated.item[0] = wm8996->retune_mobile_cfg[block]; | 443 | ucontrol->value.enumerated.item[0] = wm8996->retune_mobile_cfg[block]; |
| 442 | 444 | ||
| 443 | return 0; | 445 | return 0; |