Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 5 deletions

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)
 {
         struct fm801_gp *gp = pci_get_drvdata(pci);
 
-        if (gp) {
-                gameport_unregister_port(gp->gameport);
-                release_resource(gp->res_port);
-                kfree(gp);
-        }
+        gameport_unregister_port(gp->gameport);
+        release_resource(gp->res_port);
+        kfree(gp);
+
+        pci_disable_device(pci);
 }
 
 static const struct pci_device_id fm801_gp_id_table[] = {