summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-09-06 14:39:28 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 13:47:36 -0700
commit9089e3be60b13a1114e8afdc37c605e75cfc4a26 (patch)
tree9b17c2f588b16476cb91ccd18cb8ae94a456f6dd /drivers/misc
parent9fd379e929a2808208b1d2d4cd9697067e83a242 (diff)
downloadblackbird-op-linux-9089e3be60b13a1114e8afdc37c605e75cfc4a26.tar.gz
blackbird-op-linux-9089e3be60b13a1114e8afdc37c605e75cfc4a26.zip
VMCI: fix to pass correct device identity to free_irq()
free_irq() expects the same device identity that was passed to corresponding request_irq(), otherwise the IRQ is not freed. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Dmitry Torokhov <dtor@vmware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/vmw_vmci/vmci_guest.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/vmw_vmci/vmci_guest.c b/drivers/misc/vmw_vmci/vmci_guest.c
index b3a2b763ecf2..c98b03b99353 100644
--- a/drivers/misc/vmw_vmci/vmci_guest.c
+++ b/drivers/misc/vmw_vmci/vmci_guest.c
@@ -649,7 +649,7 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
return 0;
err_free_irq:
- free_irq(vmci_dev->irq, &vmci_dev);
+ free_irq(vmci_dev->irq, vmci_dev);
tasklet_kill(&vmci_dev->datagram_tasklet);
tasklet_kill(&vmci_dev->bm_tasklet);
OpenPOWER on IntegriCloud