---

yaml --- r: 216622 b: refs/heads/master c: 1422408 h: refs/heads/master v: v3
git-mirror · Oct 12, 2010 · 217eea2 · 217eea2
1 parent f9feb51
commit 217eea2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe3e2e7ff2da41bd7a985c4c206e05a95ebe7a6b
+refs/heads/master: 1422408b34fd27ac7ab4a42e72d4b61553b6f631
diff --git a/trunk/sound/soc/codecs/ak4642.c b/trunk/sound/soc/codecs/ak4642.c
@@ -220,7 +220,7 @@ static int ak4642_dai_startup(struct snd_pcm_substream *substream,
 		ak4642_write(codec, 0x0e, 0x19);
 		ak4642_write(codec, 0x09, 0x91);
 		ak4642_write(codec, 0x0c, 0x91);
-		ak4642_write(codec, 0x00, 0x64);
+		snd_soc_update_bits(codec, 0x00, 0x64, 0x64);
 		snd_soc_update_bits(codec, PW_MGMT2, PMHP_MASK,	PMHP);
 		snd_soc_update_bits(codec, PW_MGMT2, HPMTN,	HPMTN);
 	} else {
@@ -242,7 +242,7 @@ static int ak4642_dai_startup(struct snd_pcm_substream *substream,
 		ak4642_write(codec, 0x08, 0xe1);
 		ak4642_write(codec, 0x0b, 0x00);
 		ak4642_write(codec, 0x07, 0x21);
-		ak4642_write(codec, 0x00, 0x41);
+		snd_soc_update_bits(codec, 0x00, 0x41, 0x41);
 		ak4642_write(codec, 0x10, 0x01);
 	}
 
@@ -259,12 +259,12 @@ static void ak4642_dai_shutdown(struct snd_pcm_substream *substream,
 		/* stop headphone output */
 		snd_soc_update_bits(codec, PW_MGMT2, HPMTN,	0);
 		snd_soc_update_bits(codec, PW_MGMT2, PMHP_MASK,	0);
-		ak4642_write(codec, 0x00, 0x40);
+		snd_soc_update_bits(codec, 0x00, 0x64, 0x40);
 		ak4642_write(codec, 0x0e, 0x11);
 		ak4642_write(codec, 0x0f, 0x08);
 	} else {
 		/* stop stereo input */
-		ak4642_write(codec, 0x00, 0x40);
+		snd_soc_update_bits(codec, 0x00, 0x41, 0x40);
 		ak4642_write(codec, 0x10, 0x00);
 		ak4642_write(codec, 0x07, 0x01);
 	}