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

mariux64 · Nov 4, 2013 · 71d0c3a · 71d0c3a
2 parents f027ac7 + fe329a1
commit 71d0c3a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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;