From: dengwei1 Date: Tue, 5 Nov 2019 07:51:10 +0000 (+0800) Subject: input: update touch usb cable detect report function X-Git-Tag: MMI-RSA31.Q1-48-36-11~76 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d7d3c54f58dc63bb1672ad27475f6703d208ce78;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git input: update touch usb cable detect report function as vendor patch, change the report function in call back function Change-Id: Id0063704802c0841e14cbd5fbd2dd75a8a71c28e Signed-off-by: dengwei1 Reviewed-on: https://gerrit.mot.com/1449028 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- diff --git a/drivers/input/touchscreen/hxchipset/himax_common.c b/drivers/input/touchscreen/hxchipset/himax_common.c index 65260cd969b8..f0735a3eec59 100755 --- a/drivers/input/touchscreen/hxchipset/himax_common.c +++ b/drivers/input/touchscreen/hxchipset/himax_common.c @@ -2000,9 +2000,9 @@ void himax_ts_work(struct himax_ts_data *ts) if (debug_data != NULL) debug_data->fp_ts_dbg_func(ts, HX_FINGER_ON); -#if defined(HX_USB_DETECT_GLOBAL) +/* #if defined(HX_USB_DETECT_GLOBAL) himax_cable_detect_func(false); -#endif +#endif */ ts_path = himax_ts_work_status(ts); switch (ts_path) { @@ -2516,6 +2516,7 @@ static int charger_notifier_callback(struct notifier_block *nb, } else { charger_flag |= prop.intval; USB_detect_flag = charger_flag; + himax_cable_detect_func(false); } } }