Title: [8702] trunk/sound/soc/codecs: task[#6004]only shut down once
- Revision
- 8702
- Author
- cliff
- Date
- 2010-05-11 04:43:12 -0400 (Tue, 11 May 2010)
Log Message
task[#6004]only shut down once
Modified Paths
Diff
Modified: trunk/sound/soc/codecs/adau1371.c (8701 => 8702)
--- trunk/sound/soc/codecs/adau1371.c 2010-05-11 07:44:59 UTC (rev 8701)
+++ trunk/sound/soc/codecs/adau1371.c 2010-05-11 08:43:12 UTC (rev 8702)
@@ -651,12 +651,13 @@
struct snd_soc_codec *codec = socdev->card->codec;
u8 reg;
- reg = snd_soc_read(codec, ADAU1371_CLKSDIV);
/* deactivate */
- if (!codec->active)
+ if (!codec->active) {
+ snd_soc_write(codec, ADAU1371_PLLCTLB, 0x0);
+ snd_soc_write(codec, ADAU1371_SRCDAICTL, 0x0);
+ reg = snd_soc_read(codec, ADAU1371_CLKSDIV);
snd_soc_write(codec, ADAU1371_CLKSDIV, reg & ~CLKSDIV_COREN);
- snd_soc_write(codec, ADAU1371_PLLCTLB, 0x0);
- snd_soc_write(codec, ADAU1371_SRCDAICTL, 0x0);
+ }
}
static int adau1371_mute(struct snd_soc_dai *dai, int mute)
Modified: trunk/sound/soc/codecs/adau1373.c (8701 => 8702)
--- trunk/sound/soc/codecs/adau1373.c 2010-05-11 07:44:59 UTC (rev 8701)
+++ trunk/sound/soc/codecs/adau1373.c 2010-05-11 08:43:12 UTC (rev 8702)
@@ -718,12 +718,13 @@
struct snd_soc_codec *codec = socdev->card->codec;
u8 reg;
- reg = snd_soc_read(codec, ADAU_CLK1SDIV);
/* deactivate */
- if (!codec->active)
+ if (!codec->active) {
+ reg = snd_soc_read(codec, ADAU_CLK1SDIV);
+ snd_soc_write(codec, ADAU_DAIACTL, 0x00);
snd_soc_write(codec, ADAU_CLK1SDIV, reg & ~CLKSDIV_COREN);
- snd_soc_write(codec, ADAU_PLLACTL6, 0x0);
- snd_soc_write(codec, ADAU_DAIACTL, 0x00);
+ snd_soc_write(codec, ADAU_PLLACTL6, 0x0);
+ }
}
static int adau1373_mute(struct snd_soc_dai *dai, int mute)
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
