From 02349a1abdf4f18ed64f234aebd8faf674de4e17 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 16 Jun 2007 16:46:56 -0300
Subject: [PATCH] --- yaml --- r: 61327 b: refs/heads/master c:
 27b5a3957a205bcaa07952ed27981f69b2b2f764 h: refs/heads/master i:   61325:
 1c33e56fe01d01a06a40f65d3bfe865b97013f56   61323:
 50dfd919148f64352deb7155e2d2ef7ad76e476d   61319:
 67805dd53f3e4c703e87f390190dc3815e3efb53   61311:
 f1606b5d28cece44767b74687b5481d01b687af7 v: v3

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

diff --git a/[refs] b/[refs]
index bd1d714b7ad0..d9f6bb3743cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4052fcc7ba32ebd54cc907991cb855d909ce9d1c
+refs/heads/master: 27b5a3957a205bcaa07952ed27981f69b2b2f764
diff --git a/trunk/drivers/media/video/ivtv/ivtv-driver.c b/trunk/drivers/media/video/ivtv/ivtv-driver.c
index 67d9a8f61957..28a53c42020d 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-driver.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-driver.c
@@ -1289,10 +1289,7 @@ static void ivtv_remove(struct pci_dev *pci_dev)
 
 	IVTV_DEBUG_INFO(" Releasing irq.\n");
 	free_irq(itv->dev->irq, (void *)itv);
-
-	if (itv->dev) {
-		ivtv_iounmap(itv);
-	}
+	ivtv_iounmap(itv);
 
 	IVTV_DEBUG_INFO(" Releasing mem.\n");
 	release_mem_region(itv->base_addr, IVTV_ENCODER_SIZE);