Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef2348d6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 3b4ea5f8 515b0d70

drivers/input/touchscreen/cyttsp5/cyttsp5_core.c

+3 −2
Original line number Diff line number Diff line
@@ -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

	}