ASoC: Revert duplicated code in SSM2602 driver
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 13 Jun 2009 10:14:55 +0000 (11:14 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 13 Jun 2009 18:35:24 +0000 (19:35 +0100)
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>
sound/soc/codecs/ssm2602.c

index 1fc4c8e0899c18ec1f7f12750cf80023140cd5b7..c550750c79c0654db16d480e4abee954cc71e09f 100644 (file)
@@ -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);