diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-06 14:14:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-06 14:14:47 +0000 |
| commit | 0afc8c733e95642ee9200966081da82564af8f8f (patch) | |
| tree | 01dfd20489e9cec42f43bc0588cf82989fcc132e | |
| parent | 0d735eaa2c1d80c997fd775b679e36b80b8e85d1 (diff) | |
| parent | 1dcb4f38e5bc28dfce0f8c7eef184a090b03bfc7 (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Conflicts:
include/linux/mfd/wm8994/pdata.h
| -rw-r--r-- | include/linux/mfd/wm8994/pdata.h | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm_hubs.c | 2 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h index 882b51aefbc0..9eab263658be 100644 --- a/include/linux/mfd/wm8994/pdata.h +++ b/include/linux/mfd/wm8994/pdata.h @@ -29,7 +29,7 @@ struct wm8994_ldo_pdata { #define WM8994_CONFIGURE_GPIO 0x8000 #define WM8994_DRC_REGS 5 -#define WM8994_EQ_REGS 19 +#define WM8994_EQ_REGS 20 #define WM8958_MBC_CUTOFF_REGS 20 #define WM8958_MBC_COEFF_REGS 48 diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index b24ba9fa7ef7..c466982eed23 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -323,7 +323,7 @@ SOC_DOUBLE_R("Speaker Switch", SOC_DOUBLE_R("Speaker ZC Switch", WM8993_SPEAKER_VOLUME_LEFT, WM8993_SPEAKER_VOLUME_RIGHT, 7, 1, 0), -SOC_DOUBLE_TLV("Speaker Boost Volume", WM8993_SPKOUT_BOOST, 0, 3, 7, 0, +SOC_DOUBLE_TLV("Speaker Boost Volume", WM8993_SPKOUT_BOOST, 3, 0, 7, 0, spkboost_tlv), SOC_ENUM("Speaker Reference", speaker_ref), SOC_ENUM("Speaker Mode", speaker_mode), diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index a90e067fb0ab..17dcd56a2520 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3361,7 +3361,9 @@ int snd_soc_register_dais(struct device *dev, pr_debug("Registered DAI '%s'\n", dai->name); } + mutex_lock(&client_mutex); snd_soc_instantiate_cards(); + mutex_unlock(&client_mutex); return 0; err: |