phy: core: properly handle failure of pm_runtime_get functions

In case pm_runtime_get*() fails, it still
increments pm usage counter, so we *must*
make sure to pm_runtime_put() even in those
cases.

This patch fixes that mistake the same way
usbcore treats those possible failures.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 58e0e9739028..8797bb7d9c48 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -94,19 +94,31 @@ static struct phy_provider *of_phy_provider_lookup(struct device_node *node)
 
 int phy_pm_runtime_get(struct phy *phy)
 {
+        int ret;
+
         if (!pm_runtime_enabled(&phy->dev))
                 return -ENOTSUPP;
 
-        return pm_runtime_get(&phy->dev);
+        ret = pm_runtime_get(&phy->dev);
+        if (ret < 0 && ret != -EINPROGRESS)
+                pm_runtime_put_noidle(&phy->dev);
+
+        return ret;
 }
 EXPORT_SYMBOL_GPL(phy_pm_runtime_get);
 
 int phy_pm_runtime_get_sync(struct phy *phy)
 {
+        int ret;
+
         if (!pm_runtime_enabled(&phy->dev))
                 return -ENOTSUPP;
 
-        return pm_runtime_get_sync(&phy->dev);
+        ret = pm_runtime_get_sync(&phy->dev);
+        if (ret < 0)
+                pm_runtime_put_sync(&phy->dev);
+
+        return ret;
 }
 EXPORT_SYMBOL_GPL(phy_pm_runtime_get_sync);