diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-14 14:19:58 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-14 14:19:58 +0400 |
| commit | afe8db5f756ceb017dbcf2800f9a7302ee49a385 (patch) | |
| tree | d63ae32af5d346a373a6cb64066362828f457f04 | |
| parent | dc5de62be6138dd141e78a454e9af0fd88d1eec8 (diff) | |
| parent | a115c72802c37351b6d87dfb62938d2ad440eef4 (diff) | |
| download | linux-afe8db5f756ceb017dbcf2800f9a7302ee49a385.tar.xz | |
Merge branch 'for-3.1' into for-3.2
| -rw-r--r-- | sound/soc/codecs/wm8750.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 3f2aeec309a7..15f03721ec6f 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -789,7 +789,7 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi) static const struct spi_device_id wm8750_spi_ids[] = { { "wm8750", 0 }, { "wm8987", 0 }, - { 0, 0 }, + { }, }; MODULE_DEVICE_TABLE(spi, wm8750_spi_ids); diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 60d740ebeb5b..28650edfdebb 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2927,10 +2927,6 @@ static int wm8962_set_bias_level(struct snd_soc_codec *codec, WM8962_BIAS_ENA | 0x180); msleep(5); - - snd_soc_update_bits(codec, WM8962_CLOCKING2, - WM8962_CLKREG_OVD, - WM8962_CLKREG_OVD); } /* VMID 2*250k */ @@ -3868,6 +3864,10 @@ static int wm8962_probe(struct snd_soc_codec *codec) */ snd_soc_update_bits(codec, WM8962_CLOCKING2, WM8962_SYSCLK_ENA, 0); + /* Ensure we have soft control over all registers */ + snd_soc_update_bits(codec, WM8962_CLOCKING2, + WM8962_CLKREG_OVD, WM8962_CLKREG_OVD); + regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); if (pdata) { |