From 81175ca256c8b8ea0791ffa4f448f97cd61b0661 Mon Sep 17 00:00:00 2001
From: Andy Walls <awalls@radix.net>
Date: Sun, 30 Nov 2008 10:01:21 -0300
Subject: [PATCH] --- yaml --- r: 124311 b: refs/heads/master c:
 daa1c164db63540fe7a52c658ce14ae6a8d1ae53 h: refs/heads/master i:   124309:
 98876f545d421458de6b9e41a058d390308c1764   124307:
 ba3f1c5ad0f877d4c73e44141d8aca98bd056c79   124303:
 87b65376466cada3738a17993dcde0bd64c794c8 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/cx18/cx18-io.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 12b65690f496..f559576fe2b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 572bfea71b0fb2efb36407b4e284c1e7962d4779
+refs/heads/master: daa1c164db63540fe7a52c658ce14ae6a8d1ae53
diff --git a/trunk/drivers/media/video/cx18/cx18-io.h b/trunk/drivers/media/video/cx18/cx18-io.h
index e6716dcb1e8b..2635b3a8cc96 100644
--- a/trunk/drivers/media/video/cx18/cx18-io.h
+++ b/trunk/drivers/media/video/cx18/cx18-io.h
@@ -83,10 +83,14 @@ void cx18_writel_expect(struct cx18 *cx, u32 val, void __iomem *addr,
 			u32 eval, u32 mask)
 {
 	int i;
+	u32 r;
 	eval &= mask;
 	for (i = 0; i < CX18_MAX_MMIO_WR_RETRIES; i++) {
 		cx18_writel_noretry(cx, val, addr);
-		if (eval == (cx18_readl(cx, addr) & mask))
+		r = cx18_readl(cx, addr);
+		if (r == 0xffffffff && eval != 0xffffffff)
+			continue;
+		if (eval == (r & mask))
 			break;
 	}
 }