merge linus into release branch

[linux-2.6-omap-h63xx.git] / drivers / input / joystick / turbografx.c

diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index 7e9764937d064b6a6f861d9bde0e739ab820af87..5570fd5487c730bc973b29736033942c00c1c560 100644 (file)
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -37,6 +37,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/mutex.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
 MODULE_DESCRIPTION("TurboGraFX parallel port interface driver");
@@ -86,7 +87,7 @@ static struct tgfx {
        char phys[TGFX_MAX_DEVICES][32];
        int sticks;
        int used;
-       struct semaphore sem;
+       struct mutex sem;
 } *tgfx_base[TGFX_MAX_PORTS];
 
 /*
@@ -128,7 +129,7 @@ static int tgfx_open(struct input_dev *dev)
        struct tgfx *tgfx = dev->private;
        int err;
 
-       err = down_interruptible(&tgfx->sem);
+       err = mutex_lock_interruptible(&tgfx->sem);
        if (err)
                return err;
 
@@ -138,7 +139,7 @@ static int tgfx_open(struct input_dev *dev)
                mod_timer(&tgfx->timer, jiffies + TGFX_REFRESH_TIME);
        }
 
-       up(&tgfx->sem);
+       mutex_unlock(&tgfx->sem);
        return 0;
 }
 
@@ -146,13 +147,13 @@ static void tgfx_close(struct input_dev *dev)
 {
        struct tgfx *tgfx = dev->private;
 
-       down(&tgfx->sem);
+       mutex_lock(&tgfx->sem);
        if (!--tgfx->used) {
                del_timer_sync(&tgfx->timer);
                parport_write_control(tgfx->pd->port, 0x00);
                parport_release(tgfx->pd);
        }
-       up(&tgfx->sem);
+       mutex_unlock(&tgfx->sem);
 }
 
 
@@ -191,7 +192,7 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
                goto err_unreg_pardev;
        }
 
-       init_MUTEX(&tgfx->sem);
+       mutex_init(&tgfx->sem);
        tgfx->pd = pd;
        init_timer(&tgfx->timer);
        tgfx->timer.data = (long) tgfx;
@@ -204,14 +205,14 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
                if (n_buttons[i] > 6) {
                        printk(KERN_ERR "turbografx.c: Invalid number of buttons %d\n", n_buttons[i]);
                        err = -EINVAL;
-                       goto err_free_devs;
+                       goto err_unreg_devs;
                }
 
                tgfx->dev[i] = input_dev = input_allocate_device();
                if (!input_dev) {
                        printk(KERN_ERR "turbografx.c: Not enough memory for input device\n");
                        err = -ENOMEM;
-                       goto err_free_devs;
+                       goto err_unreg_devs;
                }
 
                tgfx->sticks |= (1 << i);
@@ -238,7 +239,9 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
                for (j = 0; j < n_buttons[i]; j++)
                        set_bit(tgfx_buttons[j], input_dev->keybit);
 
-               input_register_device(tgfx->dev[i]);
+               err = input_register_device(tgfx->dev[i]);
+               if (err)
+                       goto err_free_dev;
        }
 
         if (!tgfx->sticks) {
@@ -249,9 +252,12 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
 
        return tgfx;
 
- err_free_devs:
+ err_free_dev:
+       input_free_device(tgfx->dev[i]);
+ err_unreg_devs:
        while (--i >= 0)
-               input_unregister_device(tgfx->dev[i]);
+               if (tgfx->dev[i])
+                       input_unregister_device(tgfx->dev[i]);
  err_free_tgfx:
        kfree(tgfx);
  err_unreg_pardev:
@@ -262,7 +268,7 @@ static struct tgfx __init *tgfx_probe(int parport, int *n_buttons, int n_devs)
        return ERR_PTR(err);
 }
 
-static void __exit tgfx_remove(struct tgfx *tgfx)
+static void tgfx_remove(struct tgfx *tgfx)
 {
        int i;
 
@@ -300,7 +306,8 @@ static int __init tgfx_init(void)
 
        if (err) {
                while (--i >= 0)
-                       tgfx_remove(tgfx_base[i]);
+                       if (tgfx_base[i])
+                               tgfx_remove(tgfx_base[i]);
                return err;
        }