diff options
| author |   Wolfram Sang <wsa+renesas@sang-engineering.com> | 2015-12-16 20:05:18 +0100 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2015-12-19 12:00:37 +0100 |
| commit | b4cd08aa1f53c831e67dc5c6bc9f9acff27abcba (patch) | |
| tree | 58141870b6398365cb1a4b7a98e0b94161e0c0b3 | |
| parent | i2c: designware: Keep pm_runtime_enable/_disable calls in sync (diff) | |
| download | linux-dev-b4cd08aa1f53c831e67dc5c6bc9f9acff27abcba.tar.xz linux-dev-b4cd08aa1f53c831e67dc5c6bc9f9acff27abcba.zip | |
i2c: rcar: disable runtime PM correctly in slave mode
When we also are I2C slave, we need to disable runtime PM because the
address detection mechanism needs to be active all the time. However, we
can reenable runtime PM once the slave instance was unregistered. So,
use pm_runtime_get_sync/put to achieve this, since it has proper
refcounting. pm_runtime_allow/forbid is like a global knob controllable
from userspace which is unsuitable here.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
| -rw-r--r-- | drivers/i2c/busses/i2c-rcar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index b0ae560b38c3..599c0d7bd906 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -576,7 +576,7 @@ static int rcar_reg_slave(struct i2c_client *slave) if (slave->flags & I2C_CLIENT_TEN) return -EAFNOSUPPORT; - pm_runtime_forbid(rcar_i2c_priv_to_dev(priv)); + pm_runtime_get_sync(rcar_i2c_priv_to_dev(priv)); priv->slave = slave; rcar_i2c_write(priv, ICSAR, slave->addr); @@ -598,7 +598,7 @@ static int rcar_unreg_slave(struct i2c_client *slave) priv->slave = NULL; - pm_runtime_allow(rcar_i2c_priv_to_dev(priv)); + pm_runtime_put(rcar_i2c_priv_to_dev(priv)); return 0; } |