From 0abd47538ac60cdf43ae025f64a04fedfc0276cc Mon Sep 17 00:00:00 2001
From: Andy Walls <awalls@radix.net>
Date: Fri, 30 Jan 2009 22:39:26 -0300
Subject: [PATCH] --- yaml --- r: 137822 b: refs/heads/master c:
 072e6183c26cb00de0368a06cbbda2a2d55e6844 h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/video/cx18/cx18-audio.c       | 3 +--
 trunk/drivers/media/video/cx18/cx18-av-firmware.c | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1f32496cfda9..c4940a587f17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e474200d3502d4cb3cc240930640c7d857bf777b
+refs/heads/master: 072e6183c26cb00de0368a06cbbda2a2d55e6844
diff --git a/trunk/drivers/media/video/cx18/cx18-audio.c b/trunk/drivers/media/video/cx18/cx18-audio.c
index 57beddf0af4d..d19bd778c6ac 100644
--- a/trunk/drivers/media/video/cx18/cx18-audio.c
+++ b/trunk/drivers/media/video/cx18/cx18-audio.c
@@ -64,8 +64,7 @@ int cx18_audio_set_io(struct cx18 *cx)
 	val = cx18_read_reg(cx, CX18_AUDIO_ENABLE) & ~0x30;
 	val |= (audio_input > CX18_AV_AUDIO_SERIAL2) ? 0x20 :
 					(audio_input << 4);
-	cx18_write_reg(cx, val | 0xb00, CX18_AUDIO_ENABLE);
-	cx18_vapi(cx, CX18_APU_RESETAI, 1, 0);
+	cx18_write_reg_expect(cx, val | 0xb00, CX18_AUDIO_ENABLE, val, 0x30);
 	return 0;
 }
 
diff --git a/trunk/drivers/media/video/cx18/cx18-av-firmware.c b/trunk/drivers/media/video/cx18/cx18-av-firmware.c
index b374c74d3e7b..940ea9352115 100644
--- a/trunk/drivers/media/video/cx18/cx18-av-firmware.c
+++ b/trunk/drivers/media/video/cx18/cx18-av-firmware.c
@@ -131,7 +131,8 @@ int cx18_av_loadfw(struct cx18 *cx)
 	v = cx18_read_reg(cx, CX18_AUDIO_ENABLE);
 	/* If bit 11 is 1, clear bit 10 */
 	if (v & 0x800)
-		cx18_write_reg(cx, v & 0xFFFFFBFF, CX18_AUDIO_ENABLE);
+		cx18_write_reg_expect(cx, v & 0xFFFFFBFF, CX18_AUDIO_ENABLE,
+				      0, 0x400);
 
 	/* Enable WW auto audio standard detection */
 	v = cx18_av_read4(cx, CXADEC_STD_DET_CTL);