openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Input: fm801-gp - add missing call to pci_disable_device() 

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2010-09-29 18:17:16 -07:00
parent d8daece8f4
commit d345d97012
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/input/gameport/emu10k1-gp.c
View File

@ -106,8 +106,9 @@ static void __devexit emu_remove(struct pci_dev *pdev)
gameport_unregister_port(emu->gameport); gameport_unregister_port(emu->gameport);
release_region(emu->io, emu->size); release_region(emu->io, emu->size);
pci_disable_device(pdev);
kfree(emu); kfree(emu);
pci_disable_device(pdev);
} }
static struct pci_driver emu_driver = { static struct pci_driver emu_driver = {

10
drivers/input/gameport/fm801-gp.c
View File

@ -133,11 +133,11 @@ static void __devexit fm801_gp_remove(struct pci_dev *pci)
{ {
struct fm801_gp *gp = pci_get_drvdata(pci); struct fm801_gp *gp = pci_get_drvdata(pci);
if (gp) { gameport_unregister_port(gp->gameport);
gameport_unregister_port(gp->gameport); release_resource(gp->res_port);
release_resource(gp->res_port); kfree(gp);
kfree(gp);
} pci_disable_device(pci);
} }
static const struct pci_device_id fm801_gp_id_table[] = { static const struct pci_device_id fm801_gp_id_table[] = {