diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2015-12-23 18:19:28 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2016-01-10 09:27:06 +0100 |
| commit | 9f924169c0358f630f9b6d26bb3de97360d8647b (patch) | |
| tree | 8666344570e5a32f5df8621ea24a445c99074223 /drivers/i2c | |
| parent | 8d22f309384cc410da91543f1eb30fe5daf91c3b (diff) | |
| download | linux-stable-9f924169c0358f630f9b6d26bb3de97360d8647b.tar.gz linux-stable-9f924169c0358f630f9b6d26bb3de97360d8647b.tar.bz2 linux-stable-9f924169c0358f630f9b6d26bb3de97360d8647b.zip | |
i2c: always enable RuntimePM for the adapter device
The adapter device is a logical device. Because of that, it already uses
pm_runtime_no_callbacks() in the core. To ensure proper propagation from
the children (i2c devices) to the parent of the adapter (the HW device),
make sure RuntimePM is enabled in any case.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 7349b00f4101..ffe715d346d8 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1564,6 +1564,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap) dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name); pm_runtime_no_callbacks(&adap->dev); + pm_runtime_enable(&adap->dev); #ifdef CONFIG_I2C_COMPAT res = class_compat_create_link(i2c_adapter_compat_class, &adap->dev, @@ -1818,6 +1819,8 @@ void i2c_del_adapter(struct i2c_adapter *adap) /* device name is gone after device_unregister */ dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name); + pm_runtime_disable(&adap->dev); + /* wait until all references to the device are gone * * FIXME: This is old code and should ideally be replaced by an |