Skip to contentSkip to conversation

Patch "i2c: designware-platdrv: enable RuntimePM before registering to the core" has been added to the 4.2-stable tree

PATCH [email protected] 1 participant 1 message Oct 23, 2015

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

i2c: designware-platdrv: enable RuntimePM before registering to the core

to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
i2c-designware-platdrv-enable-runtimepm-before-registering-to-the-core.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 36d48fb5766aee9717e429f772046696b215282d Mon Sep 17 00:00:00 2001

From: Wolfram Sang <[email protected]>
Date: Fri, 9 Oct 2015 10:39:24 +0100
Subject: i2c: designware-platdrv: enable RuntimePM before registering to the core

From: Wolfram Sang <[email protected]>

commit 36d48fb5766aee9717e429f772046696b215282d upstream.

The core may register clients attached to this master which may use funtionality from the master. So, RuntimePM must be enabled before, otherwise this will fail.

---
 drivers/i2c/busses/i2c-designware-platdrv.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/i2c/busses/i2c-designware-platdrv.c +7 -6
@@ -273,12 +273,6 @@ static int dw_i2c_probe(struct platform_
 	adap->dev.parent = &pdev->dev;
 	adap->dev.of_node = pdev->dev.of_node;
 
-	r = i2c_add_numbered_adapter(adap);
-	if (r) {
-		dev_err(&pdev->dev, "failure adding adapter\n");
-		return r;
-	}
-
 	if (dev->pm_runtime_disabled) {
 		pm_runtime_forbid(&pdev->dev);
 	} else {
@@ -288,6 +282,13 @@ static int dw_i2c_probe(struct platform_
 		pm_runtime_enable(&pdev->dev);
 	}
 
+	r = i2c_add_numbered_adapter(adap);
+	if (r) {
+		dev_err(&pdev->dev, "failure adding adapter\n");
+		pm_runtime_disable(&pdev->dev);
+		return r;
+	}
+
 	return 0;
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/i2c-rcar-enable-runtimepm-before-registering-to-the-core.patch queue-4.2/i2c-s3c2410-enable-runtimepm-before-registering-to-the-core.patch queue-4.2/i2c-designware-platdrv-enable-runtimepm-before-registering-to-the-core.patch