Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

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

diff --git a/drivers/input/joystick/spaceball.c b/drivers/input/joystick/spaceball.c
index 9b3597343c1cb87db0143b7faafbbe83e490f528..abb7c4cf54ad50d07fe3bcff57d7eceea86f18d4 100644 (file)
--- a/drivers/input/joystick/spaceball.c
+++ b/drivers/input/joystick/spaceball.c
@@ -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);
 
@@ -300,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)