diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-09-29 21:17:16 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-09-29 21:25:56 -0400 |
commit | d345d97012c3f8fb72c0c9d2ee319ea958b63229 (patch) | |
tree | 534f39357cb21e4438627804889716e3224a207f | |
parent | d8daece8f457883e8f2e3065a1e02322ed444ddb (diff) |
Input: fm801-gp - add missing call to pci_disable_device()
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r-- | drivers/input/gameport/emu10k1-gp.c | 3 | ||||
-rw-r--r-- | drivers/input/gameport/fm801-gp.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c index 34615d40528a..f85620590b66 100644 --- a/drivers/input/gameport/emu10k1-gp.c +++ b/drivers/input/gameport/emu10k1-gp.c | |||
@@ -106,8 +106,9 @@ static void __devexit emu_remove(struct pci_dev *pdev) | |||
106 | 106 | ||
107 | gameport_unregister_port(emu->gameport); | 107 | gameport_unregister_port(emu->gameport); |
108 | release_region(emu->io, emu->size); | 108 | release_region(emu->io, emu->size); |
109 | pci_disable_device(pdev); | ||
110 | kfree(emu); | 109 | kfree(emu); |
110 | |||
111 | pci_disable_device(pdev); | ||
111 | } | 112 | } |
112 | 113 | ||
113 | static struct pci_driver emu_driver = { | 114 | static struct pci_driver emu_driver = { |
diff --git a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c index 14d3f3e208a2..a3b70ff21018 100644 --- a/drivers/input/gameport/fm801-gp.c +++ b/drivers/input/gameport/fm801-gp.c | |||
@@ -133,11 +133,11 @@ static void __devexit fm801_gp_remove(struct pci_dev *pci) | |||
133 | { | 133 | { |
134 | struct fm801_gp *gp = pci_get_drvdata(pci); | 134 | struct fm801_gp *gp = pci_get_drvdata(pci); |
135 | 135 | ||
136 | if (gp) { | 136 | gameport_unregister_port(gp->gameport); |
137 | gameport_unregister_port(gp->gameport); | 137 | release_resource(gp->res_port); |
138 | release_resource(gp->res_port); | 138 | kfree(gp); |
139 | kfree(gp); | 139 | |
140 | } | 140 | pci_disable_device(pci); |
141 | } | 141 | } |
142 | 142 | ||
143 | static const struct pci_device_id fm801_gp_id_table[] = { | 143 | static const struct pci_device_id fm801_gp_id_table[] = { |