From bc6a67cc29db6c9a7b99458c1c02284eedf0ca8b Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Thu, 19 Nov 2009 09:28:25 -0800 Subject: [PATCH] --- yaml --- r: 174239 b: refs/heads/master c: ab9122cd3377c9eee85380ea2fe35125c6962a87 h: refs/heads/master i: 174237: 55fadd1c6dfef811e5a4858b628e1bde6a60813c 174235: 11e656fff659ba921902b88baf59d580ca963248 174231: 0e092a66362b985c89101ceb2b668080dea849b2 174223: 54d28ef3943e0c23754120c4d82c2de3de163db7 174207: 75062c8e375e0775a7bc97c8e0d099c3a7f343e8 v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/atmel_tsadcc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d39c87f5c0c1..a84fc68ec01d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c09b2ac35ff7c5f280e5cf8142ad0822f1c93b3 +refs/heads/master: ab9122cd3377c9eee85380ea2fe35125c6962a87 diff --git a/trunk/drivers/input/touchscreen/atmel_tsadcc.c b/trunk/drivers/input/touchscreen/atmel_tsadcc.c index 9c7fce4d74d0..5a2af5973cb4 100644 --- a/trunk/drivers/input/touchscreen/atmel_tsadcc.c +++ b/trunk/drivers/input/touchscreen/atmel_tsadcc.c @@ -242,12 +242,12 @@ static int __devinit atmel_tsadcc_probe(struct platform_device *pdev) input_dev->phys = ts_dev->phys; input_dev->dev.parent = &pdev->dev; - input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); - input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); - + __set_bit(EV_ABS, input_dev->evbit); input_set_abs_params(input_dev, ABS_X, 0, 0x3FF, 0, 0); input_set_abs_params(input_dev, ABS_Y, 0, 0x3FF, 0, 0); + input_set_capability(input_dev, EV_KEY, BTN_TOUCH); + /* clk_enable() always returns 0, no need to check it */ clk_enable(ts_dev->clk);