diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-25 13:58:37 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-25 13:58:37 +0100 |
commit | d5fc3b5fe374f24b6773c22e90ef4bdda718b845 (patch) | |
tree | 3d8f2cfe059e418ad7eb37ababbc2f2cafe213c6 /sound/soc/codecs | |
parent | e2f551dacbdff8e40365a989ab66104b03316f4d (diff) | |
parent | dd5e8e6b1d4c218d2bafe002231ec460459ab5c4 (diff) |
Merge branch 'for-2.6.31' into for-2.6.32
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/ssm2602.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/wm8903.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 1fc4c8e0899..c550750c79c 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -375,10 +375,6 @@ static void ssm2602_shutdown(struct snd_pcm_substream *substream, struct snd_soc_codec *codec = socdev->card->codec; struct ssm2602_priv *ssm2602 = codec->private_data; - if (ssm2602->master_substream == substream) - ssm2602->master_substream = ssm2602->slave_substream; - - ssm2602->slave_substream = NULL; /* deactivate */ if (!codec->active) ssm2602_write(codec, SSM2602_ACTIVE, 0); diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 6239af8fdf7..c9baeae3e27 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -1255,22 +1255,18 @@ static struct { int div; } bclk_divs[] = { { 10, 0 }, - { 15, 1 }, { 20, 2 }, { 30, 3 }, { 40, 4 }, { 50, 5 }, - { 55, 6 }, { 60, 7 }, { 80, 8 }, { 100, 9 }, - { 110, 10 }, { 120, 11 }, { 160, 12 }, { 200, 13 }, { 220, 14 }, { 240, 15 }, - { 250, 16 }, { 300, 17 }, { 320, 18 }, { 440, 19 }, |