diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-13 06:14:55 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-13 14:35:24 -0400 |
commit | 5ba73683ba5223b218b26f878663e3907e85eedc (patch) | |
tree | c1b3a54981437585f30751b2d627231050c81eee /sound/soc/codecs/ssm2602.c | |
parent | ba2533a47865ec0dbc72834287a8a048e9337a95 (diff) |
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/soc/codecs/ssm2602.c')
-rw-r--r-- | sound/soc/codecs/ssm2602.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 1fc4c8e0899c..c550750c79c0 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, | |||
375 | struct snd_soc_codec *codec = socdev->card->codec; | 375 | struct snd_soc_codec *codec = socdev->card->codec; |
376 | struct ssm2602_priv *ssm2602 = codec->private_data; | 376 | struct ssm2602_priv *ssm2602 = codec->private_data; |
377 | 377 | ||
378 | if (ssm2602->master_substream == substream) | ||
379 | ssm2602->master_substream = ssm2602->slave_substream; | ||
380 | |||
381 | ssm2602->slave_substream = NULL; | ||
382 | /* deactivate */ | 378 | /* deactivate */ |
383 | if (!codec->active) | 379 | if (!codec->active) |
384 | ssm2602_write(codec, SSM2602_ACTIVE, 0); | 380 | ssm2602_write(codec, SSM2602_ACTIVE, 0); |