lkml.org 
[lkml]   [2012]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 43/44] Input: wacom - Bamboo One 1024 pressure fix
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.0-stable review patch. If anyone has any objections, please let me know.

    ------------------

    From: Chris Bagwell <chris@cnpbagwell.com>

    commit 6dc463511d4a690f01a9248df3b384db717e0b1c upstream.

    Bamboo One's with ID of 0x6a and 0x6b were added with correct
    indication of 1024 pressure levels but the Graphire packet routine
    was only looking at 9 bits. Increased to 10 bits.

    This bug caused these devices to roll over to zero pressure at half
    way mark.

    The other devices using this routine only support 256 or 512 range
    and look to fix unused bits at zero.

    Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
    Reported-by: Tushant Mirchandani <tushantin@gmail.com>
    Reviewed-by: Ping Cheng <pingc@wacom.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/input/tablet/wacom_wac.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/input/tablet/wacom_wac.c
    +++ b/drivers/input/tablet/wacom_wac.c
    @@ -242,7 +242,7 @@ static int wacom_graphire_irq(struct wac
    input_report_abs(input, ABS_X, le16_to_cpup((__le16 *)&data[2]));
    input_report_abs(input, ABS_Y, le16_to_cpup((__le16 *)&data[4]));
    if (wacom->tool[0] != BTN_TOOL_MOUSE) {
    - input_report_abs(input, ABS_PRESSURE, data[6] | ((data[7] & 0x01) << 8));
    + input_report_abs(input, ABS_PRESSURE, data[6] | ((data[7] & 0x03) << 8));
    input_report_key(input, BTN_TOUCH, data[1] & 0x01);
    input_report_key(input, BTN_STYLUS, data[1] & 0x02);
    input_report_key(input, BTN_STYLUS2, data[1] & 0x04);



    \
     
     \ /
      Last update: 2012-08-14 01:02    [W:4.193 / U:0.728 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site