Commit 22760ed3 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab

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

Signed-off-by: default avatarSteven Toth <stoth@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a1c592b7
...@@ -1423,7 +1423,8 @@ static void __devexit saa7164_finidev(struct pci_dev *pci_dev) ...@@ -1423,7 +1423,8 @@ static void __devexit saa7164_finidev(struct pci_dev *pci_dev)
kthread_stop(dev->kthread); kthread_stop(dev->kthread);
dev->kthread = NULL; 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 ], saa7164_histogram_print(&dev->ports[ SAA7164_PORT_ENC1 ],
......
...@@ -604,6 +604,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev) ...@@ -604,6 +604,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev)
} }
} }
dev->firmwareloaded = 1;
ret = 0; ret = 0;
out: out:
......
...@@ -452,6 +452,7 @@ struct saa7164_dev { ...@@ -452,6 +452,7 @@ struct saa7164_dev {
/* firmware status */ /* firmware status */
struct saa7164_fw_status fw_status; struct saa7164_fw_status fw_status;
u32 firmwareloaded;
tmComResHWDescr_t hwdesc; tmComResHWDescr_t hwdesc;
tmComResInterfaceDescr_t intfdesc; tmComResInterfaceDescr_t intfdesc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment