summaryrefslogtreecommitdiffstats
path: root/drivers/input/gameport
diff options
context:
space:
mode:
authorRahul Ruikar <rahul.ruikar@gmail.com>2010-09-29 18:12:46 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-09-29 18:25:52 -0700
commitd8daece8f457883e8f2e3065a1e02322ed444ddb (patch)
treec32ae47db4b4802f461fcdab15f3654489c04c59 /drivers/input/gameport
parent727eeb7dbeac8a7ecd2ad943eb27a5566ab83601 (diff)
downloadop-kernel-dev-d8daece8f457883e8f2e3065a1e02322ed444ddb.zip
op-kernel-dev-d8daece8f457883e8f2e3065a1e02322ed444ddb.tar.gz
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 <rahul.ruikar@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/gameport')
-rw-r--r--drivers/input/gameport/emu10k1-gp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c
index 7392992..34615d4 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);
}
OpenPOWER on IntegriCloud