Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

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

diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c
index ea9d51e70a125424ad4e97c9e63993ad90f8edff..f7ce4004f4ba1baf036766e5af0f90d7ef14c8e1 100644 (file)
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
@@ -183,10 +183,9 @@ static int spaceorb_connect(struct serio *serio, struct serio_driver *drv)
        input_dev->id.vendor = SERIO_SPACEORB;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->cdev.dev = &serio->dev;
-       input_dev->private = spaceorb;
+       input_dev->dev.parent = &serio->dev;
 
-       input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+       input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
 
        for (i = 0; i < 6; i++)
                set_bit(spaceorb_buttons[i], input_dev->keybit);
@@ -246,8 +245,7 @@ static struct serio_driver spaceorb_drv = {
 
 static int __init spaceorb_init(void)
 {
-       serio_register_driver(&spaceorb_drv);
-       return 0;
+       return serio_register_driver(&spaceorb_drv);
 }
 
 static void __exit spaceorb_exit(void)