Merge "input: touchscreen: synaptics_tcm: Fix doze-mode issue" (e544b875) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_core.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -2840,6 +2840,8 @@ static int syna_tcm_resume(struct device *dev)

		if (!tcm_hcd->init_okay)
		syna_tcm_deferred_probe(dev);
		else if (!tcm_hcd->in_suspend)
		return 0;
		else {
		if (tcm_hcd->irq_enabled) {
		tcm_hcd->watchdog.run = false;
		@@ -2848,9 +2850,6 @@ static int syna_tcm_resume(struct device *dev)
		}
		}

		if (!tcm_hcd->in_suspend)
		return 0;

		retval = pinctrl_select_state(
		tcm_hcd->ts_pinctrl,
		tcm_hcd->pinctrl_state_active);