fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / input / gameport / fm801-gp.c

diff --git a/drivers/input/gameport/fm801-gp.c b/drivers/input/gameport/fm801-gp.c
index 47e93da..1dec00e 100644 (file)
--- a/drivers/input/gameport/fm801-gp.c
+++ b/drivers/input/gameport/fm801-gp.c
@@ -82,17 +82,19 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device
 {
        struct fm801_gp *gp;
        struct gameport *port;
+       int error;
 
        gp = kzalloc(sizeof(struct fm801_gp), GFP_KERNEL);
        port = gameport_allocate_port();
        if (!gp || !port) {
                printk(KERN_ERR "fm801-gp: Memory allocation failed\n");
-               kfree(gp);
-               gameport_free_port(port);
-               return -ENOMEM;
+               error = -ENOMEM;
+               goto err_out_free;
        }
 
-       pci_enable_device(pci);
+       error = pci_enable_device(pci);
+       if (error)
+               goto err_out_free;
 
        port->open = fm801_gp_open;
 #ifdef HAVE_COOKED
@@ -106,11 +108,10 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device
        gp->gameport = port;
        gp->res_port = request_region(port->io, 0x10, "FM801 GP");
        if (!gp->res_port) {
-               kfree(gp);
-               gameport_free_port(port);
                printk(KERN_DEBUG "fm801-gp: unable to grab region 0x%x-0x%x\n",
                        port->io, port->io + 0x0f);
-               return -EBUSY;
+               error = -EBUSY;
+               goto err_out_disable_dev;
        }
 
        pci_set_drvdata(pci, gp);
@@ -119,6 +120,13 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device
        gameport_register_port(port);
 
        return 0;
+
+ err_out_disable_dev:
+       pci_disable_device(pci);
+ err_out_free:
+       gameport_free_port(port);
+       kfree(gp);
+       return error;
 }
 
 static void __devexit fm801_gp_remove(struct pci_dev *pci)