| From | Luis Henriques <> | Subject | [PATCH 3.16.y-ckt 038/129] Revert "i2c: Mark adapter devices with pm_runtime_no_callbacks" | Date | Fri, 22 May 2015 09:57:03 +0100 |
| |
3.16.7-ckt12 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Luis Henriques <luis.henriques@canonical.com>
This reverts commit aba636b877ec270075cbb01b4fceb460f0c3f07a which is commit 6ada5c1e1b077ab98fc144d7ac132b4dcc0148ec upstream.
This is being reverted because it fixes a regression that was introduced in 4.0 and does not affect 3.16 kernel.
Cc: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Cc: Beata Michalska <b.michalska@samsung.com> Cc: Wolfram Sang <wsa@the-dreams.de> Cc: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Luis Henriques <luis.henriques@canonical.com> --- drivers/i2c/i2c-core.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 4d835fbeba44..d66af95d3de4 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1252,8 +1252,6 @@ 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); - #ifdef CONFIG_I2C_COMPAT res = class_compat_create_link(i2c_adapter_compat_class, &adap->dev, adap->dev.parent);
|