From d8daece8f457883e8f2e3065a1e02322ed444ddb Mon Sep 17 00:00:00 2001 From: Rahul Ruikar Date: Wed, 29 Sep 2010 18:12:46 -0700 Subject: Input: emu10k1-gp - add missing calls to pci_disable_device() pci_disable_device() is called for following 2 cases - error path in emu_probe() - in emu_remove() Signed-off-by: Rahul Ruikar Signed-off-by: Dmitry Torokhov --- drivers/input/gameport/emu10k1-gp.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/input/gameport') diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c index 7392992da424..34615d40528a 100644 --- a/drivers/input/gameport/emu10k1-gp.c +++ b/drivers/input/gameport/emu10k1-gp.c @@ -77,6 +77,7 @@ static int __devinit emu_probe(struct pci_dev *pdev, const struct pci_device_id if (!emu || !port) { printk(KERN_ERR "emu10k1-gp: Memory allocation failed\n"); release_region(ioport, iolen); + pci_disable_device(pdev); kfree(emu); gameport_free_port(port); return -ENOMEM; @@ -105,6 +106,7 @@ static void __devexit emu_remove(struct pci_dev *pdev) gameport_unregister_port(emu->gameport); release_region(emu->io, emu->size); + pci_disable_device(pdev); kfree(emu); } -- cgit v1.2.3-59-g8ed1b