aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDaniel Hillenbrand <daniel.hillenbrand@codeworkx.de>2012-07-21 22:53:57 +0200
committerDaniel Hillenbrand <daniel.hillenbrand@codeworkx.de>2012-07-21 22:53:57 +0200
commit8305c2adc8cfd5fbe18819401ec7cb117eaee9f6 (patch)
tree7e541b5db61a34160d2d9675b96e81fa99af4e78 /drivers/input
parentcfeca268936a008ae5a22abdea42f90262f89646 (diff)
downloadkernel_samsung_smdk4412-8305c2adc8cfd5fbe18819401ec7cb117eaee9f6.zip
kernel_samsung_smdk4412-8305c2adc8cfd5fbe18819401ec7cb117eaee9f6.tar.gz
kernel_samsung_smdk4412-8305c2adc8cfd5fbe18819401ec7cb117eaee9f6.tar.bz2
samsung opensource update 2
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/mms_ts.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/mms_ts.c b/drivers/input/touchscreen/mms_ts.c
index 3a7070d..058cc89 100644
--- a/drivers/input/touchscreen/mms_ts.c
+++ b/drivers/input/touchscreen/mms_ts.c
@@ -3253,6 +3253,8 @@ static int __devinit mms_ts_probe(struct i2c_client *client,
info->max_y = 1280;
}
+ i2c_set_clientdata(client, info);
+
info->callbacks.inform_charger = melfas_ta_cb;
if (info->register_cb)
info->register_cb(&info->callbacks);
@@ -3260,7 +3262,6 @@ static int __devinit mms_ts_probe(struct i2c_client *client,
info->pdata->power(true);
msleep(100);
- i2c_set_clientdata(client, info);
ret = i2c_master_recv(client, buf, 1);
if (ret < 0) { /* tsp connect check */
pr_err("%s: i2c fail...tsp driver unload [%d], Add[%d]\n",