[3.16.y-ckt stable] Patch "Revert "i2c: Mark adapter devices with pm_runtime_no_callbacks"" has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Wed May 20 12:30:05 UTC 2015


This is a note to let you know that I have just added a patch titled

    Revert "i2c: Mark adapter devices with pm_runtime_no_callbacks"

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue

This patch is scheduled to be released in version 3.16.7-ckt12.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 854cb3164f288919c8ff309e457ba0c7973e3d3f Mon Sep 17 00:00:00 2001
From: Luis Henriques <luis.henriques at canonical.com>
Date: Mon, 18 May 2015 10:58:19 +0100
Subject: Revert "i2c: Mark adapter devices with pm_runtime_no_callbacks"

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 at opensource.wolfsonmicro.com>
Cc: Beata Michalska <b.michalska at samsung.com>
Cc: Wolfram Sang <wsa at the-dreams.de>
Cc: Ben Hutchings <ben at decadent.org.uk>
Signed-off-by: Luis Henriques <luis.henriques at 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);




More information about the kernel-team mailing list