summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-07-18 17:09:37 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-07-18 17:10:27 -0700
commit2c204109ec1018f72114c7f19132a1109a3f0653 (patch)
tree5fa55c78e21236c05d81eb9094a03e0ff4a4231c /drivers/input
parentd448303a77d8925fd06e7b2837bd1826e340bb02 (diff)
downloadlinux-2c204109ec1018f72114c7f19132a1109a3f0653.tar.gz
linux-2c204109ec1018f72114c7f19132a1109a3f0653.tar.bz2
linux-2c204109ec1018f72114c7f19132a1109a3f0653.zip
Input: cy8ctmg110_ts - set reset_pin and irq_pin from platform data
The implementation in cy8ctmg110_probe() does not properly set reset_pin and irq_pin from platform data. Let's fix it. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/cy8ctmg110_ts.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/cy8ctmg110_ts.c b/drivers/input/touchscreen/cy8ctmg110_ts.c
index ecdaae5f06c9..d8815c5d54ad 100644
--- a/drivers/input/touchscreen/cy8ctmg110_ts.c
+++ b/drivers/input/touchscreen/cy8ctmg110_ts.c
@@ -193,6 +193,8 @@ static int __devinit cy8ctmg110_probe(struct i2c_client *client,
ts->client = client;
ts->input = input_dev;
+ ts->reset_pin = pdata->reset_pin;
+ ts->irq_pin = pdata->irq_pin;
snprintf(ts->phys, sizeof(ts->phys),
"%s/input0", dev_name(&client->dev));