summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShengfei xu <xsf@rock-chips.com>2016-02-19 18:01:32 +0800
committerHuang, Tao <huangtao@rock-chips.com>2016-02-23 09:28:54 +0800
commit0957cb302a1769ac5b5f4b0b2b5af7bceaa9f4ac (patch)
tree215e782ee75fd975e4a2635e3778e2c4b49a2131
parentb6fde03e089c31680145c7b04f20c7e9f7fc0522 (diff)
Revert "input: gt9xx: remove tp_register_fb"
This reverts commit dd82161ce5de1b02eb61a4822aa0118b9082fef0. Change-Id: I277b2e6146509a56b1f7aa5a53dc481cc63cc0df Signed-off-by: Shengfei xu <xsf@rock-chips.com>
-rwxr-xr-xdrivers/input/touchscreen/gt9xx/gt9xx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/gt9xx/gt9xx.c b/drivers/input/touchscreen/gt9xx/gt9xx.c
index 68396b5613db..bbc19b4be221 100755
--- a/drivers/input/touchscreen/gt9xx/gt9xx.c
+++ b/drivers/input/touchscreen/gt9xx/gt9xx.c
@@ -2083,7 +2083,7 @@ static s8 gtp_request_input_dev(struct goodix_ts_data *ts)
ts->tp.tp_resume = goodix_ts_early_resume;
ts->tp.tp_suspend = goodix_ts_early_suspend;
-/* tp_register_fb(&ts->tp); */
+ tp_register_fb(&ts->tp);
#if GTP_WITH_PEN
gtp_pen_init(ts);
@@ -2748,11 +2748,11 @@ static int goodix_ts_probe(struct i2c_client *client, const struct i2c_device_id
probe_init_error:
printk(" <%s>_%d prob error !!!!!!!!!!!!!!!\n", __func__, __LINE__);
- /* tp_unregister_fb(&ts->tp); */
+ tp_unregister_fb(&ts->tp);
GTP_GPIO_FREE(ts->rst_pin);
GTP_GPIO_FREE(ts->irq_pin);
probe_init_error_requireio:
- /* tp_unregister_fb(&ts->tp); */
+ tp_unregister_fb(&ts->tp);
kfree(ts);
return ret;
}
@@ -2770,7 +2770,7 @@ static int goodix_ts_remove(struct i2c_client *client)
{
struct goodix_ts_data *ts = i2c_get_clientdata(client);
- /* tp_unregister_fb(&ts->tp); */
+ tp_unregister_fb(&ts->tp);
GTP_DEBUG_FUNC();