aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakeshi Yoshimura <yos@sslab.ics.keio.ac.jp>2015-05-27 10:28:14 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-06-09 18:40:33 -0400
commit25e057fdde3b33c0d18605ed27b59336a3441925 (patch)
tree4ce35fd6ea668fa65b52ddbb9d1f0e75958e501d
parentee8defeceafa05401573f3d2f1e3feca33e5a83c (diff)
[media] ddbridge: Do not free_irq() if request_irq() failed
My static checker detected that free_irq() is called even after request_irq() failed in ddb_probe(). In this case, the kernel may try to free dev->pdev->irq although the IRQ is not assigned. This event rarely occurs, but always introduces a warning if it happens. "goto fail1" always results in disabling enabled MSI and releasing a requested IRQ. It seems like the former handling is necessary. So I added a conditional branch before the free_irq() (stat == 0 means request_irq() succeeds). Signed-off-by: Takeshi Yoshimura <yos@sslab.ics.keio.ac.jp> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/pci/ddbridge/ddbridge-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
index 9e3492e20766..0ac2dd35fe50 100644
--- a/drivers/media/pci/ddbridge/ddbridge-core.c
+++ b/drivers/media/pci/ddbridge/ddbridge-core.c
@@ -1630,7 +1630,8 @@ fail1:
1630 printk(KERN_ERR "fail1\n"); 1630 printk(KERN_ERR "fail1\n");
1631 if (dev->msi) 1631 if (dev->msi)
1632 pci_disable_msi(dev->pdev); 1632 pci_disable_msi(dev->pdev);
1633 free_irq(dev->pdev->irq, dev); 1633 if (stat == 0)
1634 free_irq(dev->pdev->irq, dev);
1634fail: 1635fail:
1635 printk(KERN_ERR "fail\n"); 1636 printk(KERN_ERR "fail\n");
1636 ddb_unmap(dev); 1637 ddb_unmap(dev);