Merge "input: touchscreen: Change touch driver suspend code flow for XO shutdown"

This commit is contained in:
Linux Build Service Account 2016-08-03 04:58:50 -07:00 committed by Gerrit - the friendly Code Review server
commit 39fc21c853

View file

@ -1898,11 +1898,11 @@ static int IT7260_ts_suspend(struct device *dev)
return -EBUSY; return -EBUSY;
} }
if (device_may_wakeup(dev)) {
if (!gl_ts->device_needs_wakeup) {
/* put the device in low power idle mode */ /* put the device in low power idle mode */
IT7260_ts_chipLowPowerMode(PWR_CTL_LOW_POWER_MODE); IT7260_ts_chipLowPowerMode(PWR_CTL_LOW_POWER_MODE);
if (device_may_wakeup(dev)) {
if (!gl_ts->device_needs_wakeup) {
gl_ts->device_needs_wakeup = true; gl_ts->device_needs_wakeup = true;
enable_irq_wake(gl_ts->client->irq); enable_irq_wake(gl_ts->client->irq);
} }