openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] SOLO6x10: Remove dead code 

solo_dev and pdev cannot be NULL here. It doesn't matter if we
initialized the PCI device or not.

Signed-off-by: Krzysztof Ha?asa <khalasa@piap.pl>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Krzysztof Hałasa 2015-06-08 10:50:22 -03:00 committed by Mauro Carvalho Chehab
parent e1ceb25a15
commit d9b8252202
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/media/pci/solo6x10/solo6x10-core.c
View File

@ -134,23 +134,11 @@ static irqreturn_t solo_isr(int irq, void *data)
static void free_solo_dev(struct solo_dev *solo_dev) static void free_solo_dev(struct solo_dev *solo_dev)
{ {
struct pci_dev *pdev; struct pci_dev *pdev = solo_dev->pdev;
if (!solo_dev)
return;
if (solo_dev->dev.parent) if (solo_dev->dev.parent)
device_unregister(&solo_dev->dev); device_unregister(&solo_dev->dev);
pdev = solo_dev->pdev;
/* If we never initialized the PCI device, then nothing else
* below here needs cleanup */
if (!pdev) {
kfree(solo_dev);
return;
}
if (solo_dev->reg_base) { if (solo_dev->reg_base) {
/* Bring down the sub-devices first */ /* Bring down the sub-devices first */
solo_g723_exit(solo_dev); solo_g723_exit(solo_dev);
@ -164,8 +152,7 @@ static void free_solo_dev(struct solo_dev *solo_dev)
/* Now cleanup the PCI device */ /* Now cleanup the PCI device */
solo_irq_off(solo_dev, ~0); solo_irq_off(solo_dev, ~0);
if (pdev->irq) free_irq(pdev->irq, solo_dev);
free_irq(pdev->irq, solo_dev);
pci_iounmap(pdev, solo_dev->reg_base); pci_iounmap(pdev, solo_dev->reg_base);
} }