3.16.51-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Dmitry Torokhov <[email protected]> commit 39467fc1054a91efa697162a94e5b0e1a4b7b580 upstream. Instead of stopping the touchscreen we were starting it in suspend, and disabling it in resume. Fixes: c899afedf168 ("Input: ucb1400_ts - convert to threaded IRQ") Reported-by: Anton Volkov <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- drivers/input/touchscreen/ucb1400_ts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c @@ -415,7 +415,7 @@ static int ucb1400_ts_suspend(struct dev mutex_lock(&idev->mutex); if (idev->users) - ucb1400_ts_start(ucb); + ucb1400_ts_stop(ucb); mutex_unlock(&idev->mutex); return 0; @@ -429,7 +429,7 @@ static int ucb1400_ts_resume(struct devi mutex_lock(&idev->mutex); if (idev->users) - ucb1400_ts_stop(ucb); + ucb1400_ts_start(ucb); mutex_unlock(&idev->mutex); return 0;
