From c188b879726246d7d4a1ba2c5161911f22b0aba1 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@kernellabs.com>
Date: Sun, 5 Sep 2010 11:24:50 -0300
Subject: [PATCH] --- yaml --- r: 219395 b: refs/heads/master c:
 22760ed39c2383e7711753e7582dac5d6d5f647c h: refs/heads/master i:   219393:
 8a29a1e832ddb2e3dedf6b0280483a580b030a65   219391:
 59cb30bc0847335ee0e5a1560f246a4e4fa68446 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/video/saa7164/saa7164-core.c | 3 ++-
 trunk/drivers/media/video/saa7164/saa7164-fw.c   | 1 +
 trunk/drivers/media/video/saa7164/saa7164.h      | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 65d0f3ab77f3..028e35f19f40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1c592b766ee94aaf0e2549b8ba4d0298c328484
+refs/heads/master: 22760ed39c2383e7711753e7582dac5d6d5f647c
diff --git a/trunk/drivers/media/video/saa7164/saa7164-core.c b/trunk/drivers/media/video/saa7164/saa7164-core.c
index 222fbda0cb78..99819ac65cc9 100644
--- a/trunk/drivers/media/video/saa7164/saa7164-core.c
+++ b/trunk/drivers/media/video/saa7164/saa7164-core.c
@@ -1423,7 +1423,8 @@ static void __devexit saa7164_finidev(struct pci_dev *pci_dev)
 			kthread_stop(dev->kthread);
 			dev->kthread = NULL;
 		}
-		saa7164_api_set_debug(dev, 0x00);
+		if (dev->firmwareloaded)
+			saa7164_api_set_debug(dev, 0x00);
 	}
 
 	saa7164_histogram_print(&dev->ports[ SAA7164_PORT_ENC1 ],
diff --git a/trunk/drivers/media/video/saa7164/saa7164-fw.c b/trunk/drivers/media/video/saa7164/saa7164-fw.c
index e48e2b4878fc..484533c32bb1 100644
--- a/trunk/drivers/media/video/saa7164/saa7164-fw.c
+++ b/trunk/drivers/media/video/saa7164/saa7164-fw.c
@@ -604,6 +604,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev)
 		}
 	}
 
+	dev->firmwareloaded = 1;
 	ret = 0;
 
 out:
diff --git a/trunk/drivers/media/video/saa7164/saa7164.h b/trunk/drivers/media/video/saa7164/saa7164.h
index f16b3f961199..5ff79ab04405 100644
--- a/trunk/drivers/media/video/saa7164/saa7164.h
+++ b/trunk/drivers/media/video/saa7164/saa7164.h
@@ -452,6 +452,7 @@ struct saa7164_dev {
 
 	/* firmware status */
 	struct saa7164_fw_status	fw_status;
+	u32				firmwareloaded;
 
 	tmComResHWDescr_t		hwdesc;
 	tmComResInterfaceDescr_t	intfdesc;