Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/input/joystick/magellan.c b/drivers/input/joystick/magellan.c
index 1ba5036..ca3cc23 100644 (file)
--- a/drivers/input/joystick/magellan.c
+++ b/drivers/input/joystick/magellan.c
@@ -49,14 +49,13 @@ MODULE_LICENSE("GPL");
 
 static int magellan_buttons[] = { BTN_0, BTN_1, BTN_2, BTN_3, BTN_4, BTN_5, BTN_6, BTN_7, BTN_8 };
 static int magellan_axes[] = { ABS_X, ABS_Y, ABS_Z, ABS_RX, ABS_RY, ABS_RZ };
-static char *magellan_name = "LogiCad3D Magellan / SpaceMouse";
 
 /*
  * Per-Magellan data.
  */
 
 struct magellan {
-       struct input_dev dev;
+       struct input_dev *dev;
        int idx;
        unsigned char data[MAGELLAN_MAX_LENGTH];
        char phys[32];
@@ -85,7 +84,7 @@ static int magellan_crunch_nibbles(unsigned char *data, int count)
 
 static void magellan_process_packet(struct magellan* magellan, struct pt_regs *regs)
 {
-       struct input_dev *dev = &magellan->dev;
+       struct input_dev *dev = magellan->dev;
        unsigned char *data = magellan->data;
        int i, t;
 
@@ -138,9 +137,9 @@ static void magellan_disconnect(struct serio *serio)
 {
        struct magellan* magellan = serio_get_drvdata(serio);
 
-       input_unregister_device(&magellan->dev);
        serio_close(serio);
        serio_set_drvdata(serio, NULL);
+       input_unregister_device(magellan->dev);
        kfree(magellan);
 }
 
@@ -153,52 +152,48 @@ static void magellan_disconnect(struct serio *serio)
 static int magellan_connect(struct serio *serio, struct serio_driver *drv)
 {
        struct magellan *magellan;
-       int i, t;
-       int err;
-
-       if (!(magellan = kmalloc(sizeof(struct magellan), GFP_KERNEL)))
-               return -ENOMEM;
+       struct input_dev *input_dev;
+       int err = -ENOMEM;
+       int i;
 
-       memset(magellan, 0, sizeof(struct magellan));
+       magellan = kzalloc(sizeof(struct magellan), GFP_KERNEL);
+       input_dev = input_allocate_device();
+       if (!magellan || !input_dev)
+               goto fail;
 
-       magellan->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+       magellan->dev = input_dev;
+       sprintf(magellan->phys, "%s/input0", serio->phys);
 
-       for (i = 0; i < 9; i++)
-               set_bit(magellan_buttons[i], magellan->dev.keybit);
+       input_dev->name = "LogiCad3D Magellan / SpaceMouse";
+       input_dev->phys = magellan->phys;
+       input_dev->id.bustype = BUS_RS232;
+       input_dev->id.vendor = SERIO_MAGELLAN;
+       input_dev->id.product = 0x0001;
+       input_dev->id.version = 0x0100;
+       input_dev->cdev.dev = &serio->dev;
+       input_dev->private = magellan;
 
-       for (i = 0; i < 6; i++) {
-               t = magellan_axes[i];
-               set_bit(t, magellan->dev.absbit);
-               magellan->dev.absmin[t] = -360;
-               magellan->dev.absmax[t] =  360;
-       }
+       input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
 
-       sprintf(magellan->phys, "%s/input0", serio->phys);
+       for (i = 0; i < 9; i++)
+               set_bit(magellan_buttons[i], input_dev->keybit);
 
-       init_input_dev(&magellan->dev);
-       magellan->dev.private = magellan;
-       magellan->dev.name = magellan_name;
-       magellan->dev.phys = magellan->phys;
-       magellan->dev.id.bustype = BUS_RS232;
-       magellan->dev.id.vendor = SERIO_MAGELLAN;
-       magellan->dev.id.product = 0x0001;
-       magellan->dev.id.version = 0x0100;
-       magellan->dev.dev = &serio->dev;
+       for (i = 0; i < 6; i++)
+               input_set_abs_params(input_dev, magellan_axes[i], -360, 360, 0, 0);
 
        serio_set_drvdata(serio, magellan);
 
        err = serio_open(serio, drv);
-       if (err) {
-               serio_set_drvdata(serio, NULL);
-               kfree(magellan);
-               return err;
-       }
-
-       input_register_device(&magellan->dev);
-
-       printk(KERN_INFO "input: %s on %s\n", magellan_name, serio->phys);
+       if (err)
+               goto fail;
 
+       input_register_device(magellan->dev);
        return 0;
+
+ fail: serio_set_drvdata(serio, NULL);
+       input_free_device(input_dev);
+       kfree(magellan);
+       return err;
 }
 
 /*