Skip to content

Commit d345d97

Browse files
committed
Input: fm801-gp - add missing call to pci_disable_device()
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
1 parent d8daece commit d345d97

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

drivers/input/gameport/emu10k1-gp.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@ static void __devexit emu_remove(struct pci_dev *pdev)
106106

107107
gameport_unregister_port(emu->gameport);
108108
release_region(emu->io, emu->size);
109-
pci_disable_device(pdev);
110109
kfree(emu);
110+
111+
pci_disable_device(pdev);
111112
}
112113

113114
static struct pci_driver emu_driver = {

drivers/input/gameport/fm801-gp.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ static void __devexit fm801_gp_remove(struct pci_dev *pci)
133133
{
134134
struct fm801_gp *gp = pci_get_drvdata(pci);
135135

136-
if (gp) {
137-
gameport_unregister_port(gp->gameport);
138-
release_resource(gp->res_port);
139-
kfree(gp);
140-
}
136+
gameport_unregister_port(gp->gameport);
137+
release_resource(gp->res_port);
138+
kfree(gp);
139+
140+
pci_disable_device(pci);
141141
}
142142

143143
static const struct pci_device_id fm801_gp_id_table[] = {

0 commit comments

Comments
 (0)