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

Mark Brown committed 13 years ago

Commit 71d0c3a2 parents f027ac7 fe329a11 file · +2 −0Browse files

Unified · Split

sound/soc/codecs/wm8996.c+2−0

@@ -438,6 +438,8 @@ static int wm8996_get_retune_mobile_enum(struct snd_kcontrol *kcontrol, · 437 unmodified lines
438	438	struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
439	439	int block = wm8996_get_retune_mobile_block(kcontrol->id.name);
440	440
	441	+ if (block < 0)
	442	+ return block;
441	443	ucontrol->value.enumerated.item[0] = wm8996->retune_mobile_cfg[block];
442	444
443	445	return 0;