Darkangeel_hd
/
lineage_android_kernel_xiaomi_sdm845
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_xiaomi_sdm845.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge "input: touchscreen: cyttsp5: resume from deep sleep"

This commit is contained in:
Linux Build Service Account 2019-08-10 13:42:33 -07:00 committed by Gerrit - the friendly Code Review server
parent 3b4ea5f85a 515b0d70f2
commit ef2348d6eb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/input/touchscreen/cyttsp5/cyttsp5_core.c
View File

@ -3702,7 +3702,7 @@ static int cyttsp5_core_wake_device_from_easy_wakeup_(
rc = cyttsp5_hid_output_exit_easywake_state_(cd, rc = cyttsp5_hid_output_exit_easywake_state_(cd,
cd->easy_wakeup_gesture, &status); cd->easy_wakeup_gesture, &status);
if (rc || status == 0) { if (rc || status == 0) {
dev_err(cd->dev, "%s: failed, rc=%d, status=%d\n", dev_dbg(cd->dev, "%s: failed, rc=%d, status=%d\n",
__func__, rc, status); __func__, rc, status);
return -EBUSY; return -EBUSY;
} }
@ -4399,7 +4399,8 @@ static int cyttsp5_core_wake_device_(struct cyttsp5_core_data *cd)
if (!IS_DEEP_SLEEP_CONFIGURED(cd->easy_wakeup_gesture)) { if (!IS_DEEP_SLEEP_CONFIGURED(cd->easy_wakeup_gesture)) {
#ifdef CY_GES_WAKEUP #ifdef CY_GES_WAKEUP
return cyttsp5_core_wake_device_from_easy_wakeup_(cd); if (!cyttsp5_core_wake_device_from_easy_wakeup_(cd))
return 0;
#endif #endif
} }