diff options
| author | Felipe Balbi <balbi@ti.com> | 2013-12-20 15:00:48 -0600 |
|---|---|---|
| committer | MyungJoo Ham <myungjoo.ham@samsung.com> | 2014-05-13 02:29:51 -0700 |
| commit | 76cc48f9c3af545a54346a342b9220601520b945 (patch) | |
| tree | 974542c785bc5d8f26987616e6988d31273646cb | |
| parent | 41cdb40043a23622c3f298a6aaca8bbf459a7d0e (diff) | |
| download | linux-3.10-76cc48f9c3af545a54346a342b9220601520b945.tar.gz linux-3.10-76cc48f9c3af545a54346a342b9220601520b945.tar.bz2 linux-3.10-76cc48f9c3af545a54346a342b9220601520b945.zip | |
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>
[backport from upstream commit cedb7f89d1e1f631b7e5d920fe1ea7f742d07f79]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I8de0a4c76c5ad3de2d45996504f3f1aa716dc017
| -rw-r--r-- | drivers/phy/phy-core.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index 58e0e973902..8797bb7d9c4 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); |