Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-next

2013-11-08 10:43:43 +00:00
parent 22b468a06e fe329a1a92
commit dd212bd5bb
1 changed files with 2 additions and 0 deletions
--- 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,
 	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;