diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-16 17:38:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-16 17:38:36 +0200 |
| commit | 21ce3cd63365b0d07794adeb4325944bfa86fb4e (patch) | |
| tree | ce1d29f617d4b67b56649cd9042b920956662bf4 /sound/soc/codecs/ssm2602.c | |
| parent | e3f86d3d3ce350144562d9bd035dc8a274fce58e (diff) | |
| parent | 33745fb3448f90d2b9e414ccc6689e9ee70cfae4 (diff) | |
Merge branch 'topic/asoc' into for-linus
* topic/asoc:
ASoC: magician: fix PXA SSP clock polarity
ASoC: Instantiate any forgotten DAPM widgets
ASoC: Revert duplicated code in SSM2602 driver
ASoC: Remove odd bit clock ratios for WM8903
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 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); |