Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 13:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

phy: core: properly handle failure of pm_runtime_get functions

Browse Source 
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>
This commit is contained in:
Felipe Balbi 2013-12-20 15:00:48 -06:00 committed by Kishon Vijay Abraham I
parent 413541dd66
commit cedb7f89d1
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/phy/phy-core.c
View File

@ -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 phy_pm_runtime_get(struct phy *phy)
{ {
int ret;
if (!pm_runtime_enabled(&phy->dev)) if (!pm_runtime_enabled(&phy->dev))
return -ENOTSUPP; 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); EXPORT_SYMBOL_GPL(phy_pm_runtime_get);
int phy_pm_runtime_get_sync(struct phy *phy) int phy_pm_runtime_get_sync(struct phy *phy)
{ {
int ret;
if (!pm_runtime_enabled(&phy->dev)) if (!pm_runtime_enabled(&phy->dev))
return -ENOTSUPP; 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); EXPORT_SYMBOL_GPL(phy_pm_runtime_get_sync);