Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / input / gameport / emu10k1-gp.c

diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c
index 7392992da4243c35e127466035e1f35cb377af3a..422aa0a6b77fc62d3d4b46ffd9a42ba85cce3c99 100644 (file)
--- a/drivers/input/gameport/emu10k1-gp.c
+++ b/drivers/input/gameport/emu10k1-gp.c
@@ -59,44 +59,52 @@ MODULE_DEVICE_TABLE(pci, emu_tbl);
 
 static int __devinit emu_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-       int ioport, iolen;
        struct emu *emu;
        struct gameport *port;
-
-       if (pci_enable_device(pdev))
-               return -EBUSY;
-
-       ioport = pci_resource_start(pdev, 0);
-       iolen = pci_resource_len(pdev, 0);
-
-       if (!request_region(ioport, iolen, "emu10k1-gp"))
-               return -EBUSY;
+       int error;
 
        emu = kzalloc(sizeof(struct emu), GFP_KERNEL);
        port = gameport_allocate_port();
        if (!emu || !port) {
                printk(KERN_ERR "emu10k1-gp: Memory allocation failed\n");
-               release_region(ioport, iolen);
-               kfree(emu);
-               gameport_free_port(port);
-               return -ENOMEM;
+               error = -ENOMEM;
+               goto err_out_free;
        }
 
-       emu->io = ioport;
-       emu->size = iolen;
+       error = pci_enable_device(pdev);
+       if (error)
+               goto err_out_free;
+
+       emu->io = pci_resource_start(pdev, 0);
+       emu->size = pci_resource_len(pdev, 0);
+
        emu->dev = pdev;
        emu->gameport = port;
 
        gameport_set_name(port, "EMU10K1");
        gameport_set_phys(port, "pci%s/gameport0", pci_name(pdev));
        port->dev.parent = &pdev->dev;
-       port->io = ioport;
+       port->io = emu->io;
+
+       if (!request_region(emu->io, emu->size, "emu10k1-gp")) {
+               printk(KERN_ERR "emu10k1-gp: unable to grab region 0x%x-0x%x\n",
+                       emu->io, emu->io + emu->size - 1);
+               error = -EBUSY;
+               goto err_out_disable_dev;
+       }
 
        pci_set_drvdata(pdev, emu);
 
        gameport_register_port(port);
 
        return 0;
+
+ err_out_disable_dev:
+       pci_disable_device(pdev);
+ err_out_free:
+       gameport_free_port(port);
+       kfree(emu);
+       return error;
 }
 
 static void __devexit emu_remove(struct pci_dev *pdev)
@@ -106,6 +114,8 @@ static void __devexit emu_remove(struct pci_dev *pdev)
        gameport_unregister_port(emu->gameport);
        release_region(emu->io, emu->size);
        kfree(emu);
+
+       pci_disable_device(pdev);
 }
 
 static struct pci_driver emu_driver = {