---

yaml --- r: 219395 b: refs/heads/master c: 22760ed h: refs/heads/master i: 219393: 8a29a1e 219391: 59cb30b v: v3
git-mirror · Oct 21, 2010 · c188b87 · c188b87
1 parent 94d14d7
commit c188b87
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -452,6 +452,7 @@ struct saa7164_dev {
 
 	/* firmware status */
 	struct saa7164_fw_status	fw_status;
+	u32				firmwareloaded;
 
 	tmComResHWDescr_t		hwdesc;
 	tmComResInterfaceDescr_t	intfdesc;
-Original file line number
+Diff line change
@@ Expand Up / @@ -604,6 +604,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev) @@
     		}
     	}
+    	dev->firmwareloaded = 1;
     	ret = 0;
     out:
@@ Expand Down @@