[media] saa7164: bugfix, avoid oops when driver unloads without firmware

Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
git-mirror · Oct 21, 2010 · 22760ed · 22760ed
1 parent a1c592b
commit 22760ed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/drivers/media/video/saa7164/saa7164-core.c b/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/drivers/media/video/saa7164/saa7164-fw.c b/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/drivers/media/video/saa7164/saa7164.h b/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 @@