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>

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 58e0e97390287364287eae1eecdf8b43ba7b72f1..8797bb7d9c4885973a114ebc23aa9108af6a71b8 100644 (file)
--- 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);