lkml.org 
[lkml]   [2004]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/11] Twidjoy build fix
    Date

    ===================================================================


    ChangeSet@1.1939.3.37, 2004-11-15 23:25:52-05:00, dtor_core@ameritech.net
    Input: twidjoy - apparently Kconfig and Makefile disagreed on the
    name for config option so the module was never built.

    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>


    Makefile | 2 +-
    twidjoy.c | 14 ++++++++++----
    2 files changed, 11 insertions(+), 5 deletions(-)


    ===================================================================



    diff -Nru a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile
    --- a/drivers/input/joystick/Makefile 2004-11-24 01:47:17 -05:00
    +++ b/drivers/input/joystick/Makefile 2004-11-24 01:47:17 -05:00
    @@ -24,7 +24,7 @@
    obj-$(CONFIG_JOYSTICK_STINGER) += stinger.o
    obj-$(CONFIG_JOYSTICK_TMDC) += tmdc.o
    obj-$(CONFIG_JOYSTICK_TURBOGRAFX) += turbografx.o
    -obj-$(CONFIG_JOYSTICK_TWIDJOY) += twidjoy.o
    +obj-$(CONFIG_JOYSTICK_TWIDDLER) += twidjoy.o
    obj-$(CONFIG_JOYSTICK_WARRIOR) += warrior.o

    obj-$(CONFIG_JOYSTICK_IFORCE) += iforce/
    diff -Nru a/drivers/input/joystick/twidjoy.c b/drivers/input/joystick/twidjoy.c
    --- a/drivers/input/joystick/twidjoy.c 2004-11-24 01:47:17 -05:00
    +++ b/drivers/input/joystick/twidjoy.c 2004-11-24 01:47:17 -05:00
    @@ -58,7 +58,9 @@
    #include <linux/serio.h>
    #include <linux/init.h>

    -MODULE_DESCRIPTION("Handykey Twiddler keyboard as a joystick driver");
    +#define DRIVER_DESC "Handykey Twiddler keyboard as a joystick driver"
    +
    +MODULE_DESCRIPTION(DRIVER_DESC);
    MODULE_LICENSE("GPL");

    /*
    @@ -147,7 +149,7 @@

    static irqreturn_t twidjoy_interrupt(struct serio *serio, unsigned char data, unsigned int flags, struct pt_regs *regs)
    {
    - struct twidjoy *twidjoy = serio->private;
    + struct twidjoy *twidjoy = serio_get_drvdata(serio);

    /* All Twiddler packets are 5 bytes. The fact that the first byte
    * has a MSB of 0 and all other bytes have a MSB of 1 can be used
    @@ -175,9 +177,11 @@

    static void twidjoy_disconnect(struct serio *serio)
    {
    - struct twidjoy *twidjoy = serio->private;
    + struct twidjoy *twidjoy = serio_get_drvdata(serio);
    +
    input_unregister_device(&twidjoy->dev);
    serio_close(serio);
    + serio_set_drvdata(serio, NULL);
    kfree(twidjoy);
    }

    @@ -231,9 +235,11 @@
    }

    twidjoy->dev.private = twidjoy;
    - serio->private = twidjoy;
    +
    + serio_set_drvdata(serio, twidjoy);

    if (serio_open(serio, drv)) {
    + serio_set_drvdata(serio, NULL);
    kfree(twidjoy);
    return;
    }
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:08    [W:0.042 / U:0.004 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site