summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-06-13 11:14:55 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-06-13 19:35:24 +0100
commit5ba73683ba5223b218b26f878663e3907e85eedc (patch)
treec1b3a54981437585f30751b2d627231050c81eee /sound
parentba2533a47865ec0dbc72834287a8a048e9337a95 (diff)
downloadlinux-3.10-5ba73683ba5223b218b26f878663e3907e85eedc.tar.gz
linux-3.10-5ba73683ba5223b218b26f878663e3907e85eedc.tar.bz2
linux-3.10-5ba73683ba5223b218b26f878663e3907e85eedc.zip
ASoC: Revert duplicated code in SSM2602 driver
The Blackfin submission was done as a patch against a different tree and contained a duplicate hunk which will cause us to loose track of the substream pointers when shutting down. Remove one of the duplicated hunks. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/ssm2602.c4
1 files changed, 0 insertions, 4 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);