evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Steven Toth 2010-09-05 11:24:50 -03:00 • committed by Mauro Carvalho Chehab
parent a1c592b766
commit 22760ed39c
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/media/video/saa7164/saa7164-core.c
View file

@ -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 ],

1
drivers/media/video/saa7164/saa7164-fw.c
View file

@ -604,6 +604,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev)
} }
} }
dev->firmwareloaded = 1;
ret = 0; ret = 0;
out: out:

1
drivers/media/video/saa7164/saa7164.h
View file

@ -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;