Merge omap-drivers

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

diff --git a/drivers/input/joystick/spaceball.c b/drivers/input/joystick/spaceball.c
index 2a9808cf826f146182e8e4e9bc33e9883c08610e..abb7c4cf54ad50d07fe3bcff57d7eceea86f18d4 100644 (file)
--- a/drivers/input/joystick/spaceball.c
+++ b/drivers/input/joystick/spaceball.c
@@ -215,7 +215,7 @@ static int spaceball_connect(struct serio *serio, struct serio_driver *drv)
        spaceball = kmalloc(sizeof(struct spaceball), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!spaceball || !input_dev)
-               goto fail;
+               goto fail1;
 
        spaceball->dev = input_dev;
        snprintf(spaceball->phys, sizeof(spaceball->phys), "%s/input0", serio->phys);
@@ -226,8 +226,7 @@ static int spaceball_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_SPACEBALL;
        input_dev->id.product = id;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
-       input_dev->private = spaceball;
+       input_dev->dev.parent = &serio->dev;
 
        input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
 
@@ -252,13 +251,17 @@ static int spaceball_connect(struct serio *serio, struct serio_driver *drv)
 
        err = serio_open(serio, drv);
        if (err)
-               goto fail;
+               goto fail2;
+
+       err = input_register_device(spaceball->dev);
+       if (err)
+               goto fail3;
 
-       input_register_device(spaceball->dev);
        return 0;
 
- fail: serio_set_drvdata(serio, NULL);
-       input_free_device(input_dev);
+ fail3:        serio_close(serio);
+ fail2:        serio_set_drvdata(serio, NULL);
+ fail1:        input_free_device(input_dev);
        kfree(spaceball);
        return err;
 }
@@ -296,8 +299,7 @@ static struct serio_driver spaceball_drv = {
 
 static int __init spaceball_init(void)
 {
-       serio_register_driver(&spaceball_drv);
-       return 0;
+       return serio_register_driver(&spaceball_drv);
 }
 
 static void __exit spaceball_exit(void)