diff options
| author | Colin Cross <ccross@android.com> | 2010-12-21 18:34:37 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-12-21 18:34:37 -0800 |
| commit | b104a07edb2a319f734ddc4fe04852865d8d9e24 (patch) | |
| tree | a0cd50b3d84ece4d94e366fac4b440e380c2d247 /sound/soc/codecs/wm8900.c | |
| parent | e87ec4d59e1f96381547e614c5279bed63775719 (diff) | |
| parent | a1346c99fc89f2b3d35c7d7e2e4aef8ea4124342 (diff) | |
Merge commit 'v2.6.36.2' into linux-tegra-2.6.36
Diffstat (limited to 'sound/soc/codecs/wm8900.c')
| -rw-r--r-- | sound/soc/codecs/wm8900.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 5da17a704e5a..4b8ffc2ea71d 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c @@ -188,7 +188,6 @@ static int wm8900_volatile_register(unsigned int reg) { switch (reg) { case WM8900_REG_ID: - case WM8900_REG_POWER1: return 1; default: return 0; @@ -1236,11 +1235,6 @@ static __devinit int wm8900_i2c_probe(struct i2c_client *i2c, goto err; } - /* Read back from the chip */ - reg = snd_soc_read(codec, WM8900_REG_POWER1); - reg = (reg >> 12) & 0xf; - dev_info(&i2c->dev, "WM8900 revision %d\n", reg); - wm8900_reset(codec); /* Turn the chip on */ |