Messages in this thread | | | Subject | Re: [PATCH] phy: core: fix wrong err handle for phy_power_on | From | Kishon Vijay Abraham I <> | Date | Wed, 3 Feb 2016 11:55:09 +0530 |
| |
Hi,
On Thursday 28 January 2016 01:44 PM, Shawn Lin wrote: > If phy_pm_runtime_get_sync failed but we already > enable regulator, current code return directly without > doing regulator_disable. This patch fix this problem > and cleanup err handle of phy_power_on to be more readable. > > Fixes: 3be88125d85d ("phy: core: Support regulator ...") > Cc: Roger Quadros <rogerq@ti.com> > Cc: Axel Lin <axel.lin@ingics.com> > Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Thank you for fixing this. Merged it.
Thanks Kishon
> --- > > drivers/phy/phy-core.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c > index 8c7f27d..e7e574d 100644 > --- a/drivers/phy/phy-core.c > +++ b/drivers/phy/phy-core.c > @@ -275,20 +275,21 @@ EXPORT_SYMBOL_GPL(phy_exit); > > int phy_power_on(struct phy *phy) > { > - int ret; > + int ret = 0; > > if (!phy) > - return 0; > + goto out; > > if (phy->pwr) { > ret = regulator_enable(phy->pwr); > if (ret) > - return ret; > + goto out; > } > > ret = phy_pm_runtime_get_sync(phy); > if (ret < 0 && ret != -ENOTSUPP) > - return ret; > + goto err_pm_sync; > + > ret = 0; /* Override possible ret == -ENOTSUPP */ > > mutex_lock(&phy->mutex); > @@ -296,19 +297,20 @@ int phy_power_on(struct phy *phy) > ret = phy->ops->power_on(phy); > if (ret < 0) { > dev_err(&phy->dev, "phy poweron failed --> %d\n", ret); > - goto out; > + goto err_pwr_on; > } > } > ++phy->power_count; > mutex_unlock(&phy->mutex); > return 0; > > -out: > +err_pwr_on: > mutex_unlock(&phy->mutex); > phy_pm_runtime_put_sync(phy); > +err_pm_sync: > if (phy->pwr) > regulator_disable(phy->pwr); > - > +out: > return ret; > } > EXPORT_SYMBOL_GPL(phy_power_on); >
| |