Skip to content

Commit

Permalink
ASoC: Revert duplicated code in SSM2602 driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown committed Jun 13, 2009
1 parent ba2533a commit 5ba7368
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions sound/soc/codecs/ssm2602.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 5ba7368

Please sign in to comment.