Skip to contentSkip to conversation

Patch "i2c: rcar: 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: rcar: 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-rcar-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 4f7effddf4549d57114289f273710f077c4c330a Mon Sep 17 00:00:00 2001

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

From: Wolfram Sang <[email protected]>

commit 4f7effddf4549d57114289f273710f077c4c330a 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. While here, move drvdata, too.

---
 drivers/i2c/busses/i2c-rcar.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/i2c/busses/i2c-rcar.c +4 -3
@@ -690,15 +690,16 @@ static int rcar_i2c_probe(struct platfor
 		return ret;
 	}
 
+	pm_runtime_enable(dev);
+	platform_set_drvdata(pdev, priv);
+
 	ret = i2c_add_numbered_adapter(adap);
 	if (ret < 0) {
 		dev_err(dev, "reg adap failed: %d\n", ret);
+		pm_runtime_disable(dev);
 		return ret;
 	}
 
-	pm_runtime_enable(dev);
-	platform_set_drvdata(pdev, priv);
-
 	dev_info(dev, "probed\n");
 
 	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