From: Mark Brown <broonie@linaro.org>
Date: Sat, 1 Mar 2014 03:03:16 +0000 (+0900)
Subject: Merge branches 'topic/dapm', 'topic/sign', 'topic/adau1373', 'topic/max98090', 'topic... 
X-Git-Tag: next-20140306~53^2~12^2~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a304681f36f5c4bf3f6ea905320715573317d62b;p=karo-tx-linux.git

Merge branches 'topic/dapm', 'topic/sign', 'topic/adau1373', 'topic/max98090', 'topic/mc13783', 'fix/wm8994' and 'topic/wm8995' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-enum
---

a304681f36f5c4bf3f6ea905320715573317d62b
diff --cc sound/soc/omap/ams-delta.c
index 2eca91a51f51,5750de197d0d,629446482a91,629446482a91,629446482a91,629446482a91,629446482a91,629446482a91..8a5363674075
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@@@@@@@@ -103,10 -103,10 -103,10 -103,10 -103,10 -103,10 -103,10 -103,10 +103,10 @@@@@@@@@ static int ams_delta_set_audio_mode(str
        	if (!codec->hw_write)
        		return -EUNATCH;
        
 -------	if (ucontrol->value.enumerated.item[0] >= control->max)
 +++++++	if (ucontrol->value.enumerated.item[0] >= control->items)
        		return -EINVAL;
        
- ------	mutex_lock(&codec->mutex);
+ ++++++	snd_soc_dapm_mutex_lock(dapm);
        
        	/* Translate selection to bitmap */
        	pins = ams_delta_audio_mode_pins[ucontrol->value.enumerated.item[0]];