diff options
| author | Vishwanath BS <vishwanath.bs@ti.com> | 2010-09-30 14:14:22 +0200 |
|---|---|---|
| committer | Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> | 2011-01-18 13:14:32 +0100 |
| commit | 6bf28c4c64c697b19b91a2a33ac08df319fec263 (patch) | |
| tree | c7826c0107ed3b8f8d4340d9e606e9747ab8ce2b /drivers/i2c | |
| parent | 3f0055b3ba56385286b8d2cdaa17f717217b1685 (diff) | |
i2c: Fix for suspend/resume issue
In current i2c core driver, call to pm_runtime_set_active from
i2c_device_pm_resume will unconditionally enable i2c module and
increment child count of the parent. Because of this, in CPU Idle
path, i2c does not idle, preventing Core to enter retention. Also i2c
module will not be suspended upon system suspend as
pm_runtime_set_suspended is not called from i2c_device_pm_suspend.
This issue is fixed by removing pm_runtime_set_active call from resume
path which is not necessary.
This fix has been tested on OMAP4430.
Signed-off-by: Partha Basak <p-basak2@ti.com>
Signed-off-by: Vishwanath BS <vishwanath.bs@ti.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
ST-Ericsson Linux next: -
ST-Ericsson ID: AP317082
ST-Ericsson FOSS-OUT ID: -
Change-Id: Iba7d3a0226af6259f80cfee18891a327844c83c5
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/12725
Tested-by: Rabin VINCENT <rabin.vincent@stericsson.com>
Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 0815e10da7c..8eeb833aa20 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -208,12 +208,6 @@ static int i2c_device_pm_resume(struct device *dev) else ret = i2c_legacy_resume(dev); - if (!ret) { - pm_runtime_disable(dev); - pm_runtime_set_active(dev); - pm_runtime_enable(dev); - } - return ret; } |