shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

ts: rk29_i2c_goodix: fix shutdown panic, prevent unregister_early_suspend before register_early_suspend

Browse Source
This commit is contained in:
黄涛
2013-08-08 14:37:19 +08:00
parent 1ce74250f9
commit 803063762a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/input/touchscreen/rk29_i2c_goodix.c
View File

@@ -780,7 +780,6 @@ static int rk_ts_probe(struct i2c_client *client, const struct i2c_device_id *id
ts->power = goodix_ts_power;
ts->get_touch_info = goodix_get_touch_info;
ts->input_parms_init = goodix_input_params_init;
i2c_set_clientdata(client, ts);
if (pdata->init_platform_hw)
@@ -821,6 +820,7 @@ static int rk_ts_probe(struct i2c_client *client, const struct i2c_device_id *id
ts->early_suspend.resume = rk_ts_late_resume;
register_early_suspend(&ts->early_suspend);
#endif
i2c_set_clientdata(client, ts);
info_buf= kzalloc(ts->max_touch_num*sizeof(struct rk_touch_info), GFP_KERNEL);
if(!info_buf)
@@ -901,7 +901,8 @@ static void rk_ts_shutdown(struct i2c_client *client)
{
#ifdef CONFIG_HAS_EARLYSUSPEND
struct rk_ts_data *ts = i2c_get_clientdata(client);
unregister_early_suspend(&ts->early_suspend);
if (ts)
unregister_early_suspend(&ts->early_suspend);
#endif
}