vserver 1.9.5.x5

[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 7cd7deb..ab0a151 100644 (file)
--- a/drivers/input/gameport/fm801-gp.c
+++ b/drivers/input/gameport/fm801-gp.c
@@ -98,8 +98,8 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device
        pci_enable_device(pci);
        gp->gameport.io = pci_resource_start(pci, 0);
        if ((gp->res_port = request_region(gp->gameport.io, 0x10, "FM801 GP")) == NULL) {
-               kfree(gp);
                printk("unable to grab region 0x%x-0x%x\n", gp->gameport.io, gp->gameport.io + 0x0f);
+               kfree(gp);
                return -1;
        }
 
@@ -111,7 +111,7 @@ static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device
 
        pci_set_drvdata(pci, gp);
 
-       outb(0x60, gp->gameport.io + 0x0d); /* enable joystick 1 and 2 */ 
+       outb(0x60, gp->gameport.io + 0x0d); /* enable joystick 1 and 2 */
 
        gameport_register_port(&gp->gameport);
 
@@ -137,7 +137,7 @@ static struct pci_device_id fm801_gp_id_table[] = {
 };
 
 static struct pci_driver fm801_gp_driver = {
-       .name =         "FM801 GP",
+       .name =         "FM801_gameport",
        .id_table =     fm801_gp_id_table,
        .probe =        fm801_gp_probe,
        .remove =       __devexit_p(fm801_gp_remove),