aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2019-07-03 13:15:53 +0100
committerSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2019-10-28 14:08:03 +0000
commit725d612434e64c4aeefeeff7559c4722cbb211fe (patch)
tree26bfff68d84a663e7be21644d1447388515f5fb6
parent84b7c88ba03ce1a8218103b756988ec1c29ccf84 (diff)
HACK: soundwire: bus: check pm runtime enabled before err
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-rw-r--r--drivers/soundwire/bus.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index d35b7ca24af8b..a4bc1746289f7 100644
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -334,9 +334,11 @@ int sdw_nread(struct sdw_slave *slave, u32 addr, size_t count, u8 *val)
if (ret < 0)
return ret;
- ret = pm_runtime_get_sync(slave->bus->dev);
- if (ret < 0)
- return ret;
+ if (pm_runtime_enabled(slave->bus->dev)) {
+ ret = pm_runtime_get_sync(slave->bus->dev);
+ if (ret < 0)
+ return ret;
+ }
ret = sdw_transfer(slave->bus, &msg);
pm_runtime_put(slave->bus->dev);
@@ -362,9 +364,11 @@ int sdw_nwrite(struct sdw_slave *slave, u32 addr, size_t count, u8 *val)
if (ret < 0)
return ret;
- ret = pm_runtime_get_sync(slave->bus->dev);
- if (ret < 0)
- return ret;
+ if (pm_runtime_enabled(slave->bus->dev)) {
+ ret = pm_runtime_get_sync(slave->bus->dev);
+ if (ret < 0)
+ return ret;
+ }
ret = sdw_transfer(slave->bus, &msg);
pm_runtime_put(slave->bus->dev);