fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/input/joystick/spaceorb.c b/drivers/input/joystick/spaceorb.c
index 7c123a0..c9c7921 100644 (file)
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
@@ -74,7 +74,7 @@ static unsigned char *spaceorb_errors[] = { "EEPROM storing 0 failed", "Receive
  * SpaceOrb.
  */
 
-static void spaceorb_process_packet(struct spaceorb *spaceorb, struct pt_regs *regs)
+static void spaceorb_process_packet(struct spaceorb *spaceorb)
 {
        struct input_dev *dev = spaceorb->dev;
        unsigned char *data = spaceorb->data;
@@ -86,8 +86,6 @@ static void spaceorb_process_packet(struct spaceorb *spaceorb, struct pt_regs *r
        for (i = 0; i < spaceorb->idx; i++) c ^= data[i];
        if (c) return;
 
-       input_regs(dev, regs);
-
        switch (data[0]) {
 
                case 'R':                               /* Reset packet */
@@ -131,12 +129,12 @@ static void spaceorb_process_packet(struct spaceorb *spaceorb, struct pt_regs *r
 }
 
 static irqreturn_t spaceorb_interrupt(struct serio *serio,
-               unsigned char data, unsigned int flags, struct pt_regs *regs)
+               unsigned char data, unsigned int flags)
 {
        struct spaceorb* spaceorb = serio_get_drvdata(serio);
 
        if (~data & 0x80) {
-               if (spaceorb->idx) spaceorb_process_packet(spaceorb, regs);
+               if (spaceorb->idx) spaceorb_process_packet(spaceorb);
                spaceorb->idx = 0;
        }
        if (spaceorb->idx < SPACEORB_MAX_LENGTH)
@@ -174,10 +172,10 @@ static int spaceorb_connect(struct serio *serio, struct serio_driver *drv)
        spaceorb = kzalloc(sizeof(struct spaceorb), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!spaceorb || !input_dev)
-               goto fail;
+               goto fail1;
 
        spaceorb->dev = input_dev;
-       sprintf(spaceorb->phys, "%s/input0", serio->phys);
+       snprintf(spaceorb->phys, sizeof(spaceorb->phys), "%s/input0", serio->phys);
 
        input_dev->name = "SpaceTec SpaceOrb 360 / Avenger";
        input_dev->phys = spaceorb->phys;
@@ -200,13 +198,17 @@ static int spaceorb_connect(struct serio *serio, struct serio_driver *drv)
 
        err = serio_open(serio, drv);
        if (err)
-               goto fail;
+               goto fail2;
+
+       err = input_register_device(spaceorb->dev);
+       if (err)
+               goto fail3;
 
-       input_register_device(spaceorb->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(spaceorb);
        return err;
 }
@@ -244,8 +246,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)