diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-08-14 03:43:52 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-08-14 03:43:55 -0700 |
| commit | 72994b380e50b7443ff6ef60465add4e9c274569 (patch) | |
| tree | 9fcb4c93a8accc6edb2df2d3d3fbddca9539623d | |
| parent | 070d26c906a94dd0ce48c3975bab3ca9c3265dea (diff) | |
| parent | d9b695483e8b3b7eb9d64ad526b62a32f3167ab8 (diff) | |
Merge "input: touchscreen: cyttsp5: resume from deep sleep" into LAW.BR.4.0.r1.2LAW.BR.4.0.r1-03500-89xx.0
| -rw-r--r-- | drivers/input/touchscreen/cyttsp5/cyttsp5_core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c index 119ac457dee1..44bb9ba6507e 100644 --- a/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c +++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c @@ -3702,7 +3702,7 @@ static int cyttsp5_core_wake_device_from_easy_wakeup_( rc = cyttsp5_hid_output_exit_easywake_state_(cd, cd->easy_wakeup_gesture, &status); 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); 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)) { #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 } |