From fed4c623bc24d6ec5fbd30ebcc6f04b5cf451f48 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Mon, 12 May 2008 14:48:26 -0300
Subject: [PATCH] --- yaml --- r: 96702 b: refs/heads/master c:
 cba627a51a26eaed3526c423f5fd0410dd721ae2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 165f1c699afa..6b53b0b7c0c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d081601315f5c9b9537b702bcb2c8d96fc089ef
+refs/heads/master: cba627a51a26eaed3526c423f5fd0410dd721ae2
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.c b/trunk/drivers/media/video/cx18/cx18-driver.c
index 98e1bddc290b..0dd4e0529970 100644
--- a/trunk/drivers/media/video/cx18/cx18-driver.c
+++ b/trunk/drivers/media/video/cx18/cx18-driver.c
@@ -904,8 +904,7 @@ static void cx18_remove(struct pci_dev *pci_dev)
 
 	free_irq(cx->dev->irq, (void *)cx);
 
-	if (cx->dev)
-		cx18_iounmap(cx);
+	cx18_iounmap(cx);
 
 	release_mem_region(cx->base_addr, CX18_MEM_SIZE);