diff options
| author | Robert Collins <rcollins@nvidia.com> | 2011-06-27 16:33:01 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:19 -0800 |
| commit | 40b101307e8d6a01a6af28cb4221c5b59212770e (patch) | |
| tree | 0a3ffddc49c1ad9f8f253695f173bacd5fcaddd5 /drivers | |
| parent | 49a964841735f74b022f9b99b0aacf5544327ab6 (diff) | |
input: touch: atmel_mxt_ts: Prevent double suspend/resume.
In the case where early suspend/resume is enabled, prevent
suspend/resume from being called twice. Removing the
default suspend/resume handlers while early suspend/resume is
enabled prevents the double suspend/resume from occurring.
BUG 843934
Original-Change-Id: I2e014f7a79db524cbe9d5b8b934c8f42216a8ad5
Reviewed-on: http://git-master/r/38576
Tested-by: Krishna Yarlagadda <kyarlagadda@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Robert R Collins <rcollins@nvidia.com>
Tested-by: Robert R Collins <rcollins@nvidia.com>
Rebase-Id: R6c38a345206679eb2ee5ca279d0ffa922c3f8744
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 115df441a29f..c9527efaffda 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -1773,13 +1773,13 @@ static void mxt_early_resume(struct early_suspend *es) dev_err(&mxt->client->dev, "%s: failed\n", __func__); dev_info(dev, "MXT Early Resumed\n"); } -#endif - +#else static const struct dev_pm_ops mxt_pm_ops = { .suspend = mxt_suspend, .resume = mxt_resume, }; #endif +#endif static const struct i2c_device_id mxt_id[] = { { "qt602240_ts", 0 }, @@ -1793,7 +1793,7 @@ static struct i2c_driver mxt_driver = { .driver = { .name = "atmel_mxt_ts", .owner = THIS_MODULE, -#ifdef CONFIG_PM +#if !defined(CONFIG_HAS_EARLYSUSPEND) .pm = &mxt_pm_ops, #endif }, |