From 09a68c50b91959db81eddb117bb8c319cde5b35c Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Tue, 6 May 2008 20:42:32 -0700
Subject: [PATCH] --- yaml --- r: 96134 b: refs/heads/master c:
 cb6969e8cdef39e613b1755eff595f830b89bc82 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/md/raid10.c                    | 2 +-
 trunk/drivers/media/video/cx18/cx18-driver.c | 2 +-
 trunk/sound/oss/kahlua.c                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b1c6f50e0861..d90024a643c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8594303a7abc1a117b1d91412ce9b3d77ed35d02
+refs/heads/master: cb6969e8cdef39e613b1755eff595f830b89bc82
diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c
index 5938fa962922..faf3d8912979 100644
--- a/trunk/drivers/md/raid10.c
+++ b/trunk/drivers/md/raid10.c
@@ -886,7 +886,7 @@ static int make_request(struct request_queue *q, struct bio * bio)
 	 */
 	raid10_find_phys(conf, r10_bio);
  retry_write:
-	blocked_rdev = 0;
+	blocked_rdev = NULL;
 	rcu_read_lock();
 	for (i = 0;  i < conf->copies; i++) {
 		int d = r10_bio->devs[i].devnum;
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.c b/trunk/drivers/media/video/cx18/cx18-driver.c
index 8f5ed9b4bf83..3f55d47bc4b9 100644
--- a/trunk/drivers/media/video/cx18/cx18-driver.c
+++ b/trunk/drivers/media/video/cx18/cx18-driver.c
@@ -613,7 +613,7 @@ static int __devinit cx18_probe(struct pci_dev *dev,
 	}
 
 	cx = kzalloc(sizeof(struct cx18), GFP_ATOMIC);
-	if (cx == 0) {
+	if (!cx) {
 		spin_unlock(&cx18_cards_lock);
 		return -ENOMEM;
 	}
diff --git a/trunk/sound/oss/kahlua.c b/trunk/sound/oss/kahlua.c
index dfe670f12e67..eb9bc365530d 100644
--- a/trunk/sound/oss/kahlua.c
+++ b/trunk/sound/oss/kahlua.c
@@ -67,7 +67,7 @@ static int __devinit probe_one(struct pci_dev *pdev, const struct pci_device_id
 		return 1;
 	
 	mem = ioremap(base, 128);
-	if(mem == 0UL)
+	if (!mem)
 		return 1;
 	map = readw(mem + 0x18);	/* Read the SMI enables */
 	iounmap(mem);