From: patrice.chotard@st•com (Patrice Chotard)
To: linux-arm-kernel@lists•infradead.org
Subject: [STLinux Kernel] [PATCH] phy: stih41x-usb: Fixup stih41x_usb_phy_power_on failure path
Date: Tue, 17 Mar 2015 09:06:59 +0100 [thread overview]
Message-ID: <5507E0A3.2080500@st.com> (raw)
In-Reply-To: <1426552741.6645.1.camel@phoenix>
Hi Axel
On 03/17/2015 01:39 AM, Axel Lin wrote:
> If stih41x_usb_phy_power_on() fails, we need to call clk_disable_unprepare()
> before return error. This is to ensure we have balanced clk_enable/disable
> calls.
>
> Signed-off-by: Axel Lin <axel.lin@ingics•com>
> ---
> drivers/phy/phy-stih41x-usb.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/phy/phy-stih41x-usb.c b/drivers/phy/phy-stih41x-usb.c
> index a603801..c093b47 100644
> --- a/drivers/phy/phy-stih41x-usb.c
> +++ b/drivers/phy/phy-stih41x-usb.c
> @@ -87,8 +87,12 @@ static int stih41x_usb_phy_power_on(struct phy *phy)
> return ret;
> }
>
> - return regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
> - phy_dev->cfg->oscok, phy_dev->cfg->oscok);
> + ret = regmap_update_bits(phy_dev->regmap, phy_dev->cfg->syscfg,
> + phy_dev->cfg->oscok, phy_dev->cfg->oscok);
> + if (ret)
> + clk_disable_unprepare(phy_dev->clk);
> +
> + return ret;
> }
>
> static int stih41x_usb_phy_power_off(struct phy *phy)
Acked-by: Patrice Chotard <patrice.chotard@st•com>
Thanks
prev parent reply other threads:[~2015-03-17 8:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-17 0:39 [PATCH] phy: stih41x-usb: Fixup stih41x_usb_phy_power_on failure path Axel Lin
2015-03-17 8:06 ` Patrice Chotard [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5507E0A3.2080500@st.com \
--to=patrice.chotard@st$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox