From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Dongliang Mu <dzm91@hust.edu.cn>
Cc: Dongliang Mu <mudongliangabcd@gmail.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] usb: misc: usb3503: call clk_disable_unprepare in the error handling
Date: Wed, 7 Sep 2022 16:25:21 +0200 [thread overview]
Message-ID: <Yxip0d2bBOi/CB4P@kroah.com> (raw)
In-Reply-To: <20220903071543.2844698-1-dzm91@hust.edu.cn>
On Sat, Sep 03, 2022 at 03:15:40PM +0800, Dongliang Mu wrote:
> From: Dongliang Mu <mudongliangabcd@gmail.com>
>
> Smatch reports the following warning:
>
> vers/usb/misc/usb3503.c:267 usb3503_probe() warn: 'hub->clk'
> from clk_prepare_enable() not released on lines: 240,246,252
>
> Fix this by adding a flag to indicate if hub->clk is prepared or not and
> invoke clk_disable_unprepare in the error handling.
>
> Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
> ---
> drivers/usb/misc/usb3503.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c
> index 330f494cd158..add47dd964b2 100644
> --- a/drivers/usb/misc/usb3503.c
> +++ b/drivers/usb/misc/usb3503.c
> @@ -160,6 +160,7 @@ static int usb3503_probe(struct usb3503 *hub)
> struct usb3503_platform_data *pdata = dev_get_platdata(dev);
> struct device_node *np = dev->of_node;
> int err;
> + int is_clk_enable = 0;
bool?
> u32 mode = USB3503_MODE_HUB;
> const u32 *property;
> enum gpiod_flags flags;
> @@ -217,6 +218,8 @@ static int usb3503_probe(struct usb3503 *hub)
> return err;
> }
>
> + // set a flag for successful clk_prepare_enable
Comment isn't needed.
> + is_clk_enable = 1;
> property = of_get_property(np, "disabled-ports", &len);
> if (property && (len / sizeof(u32)) > 0) {
> int i;
> @@ -236,20 +239,29 @@ static int usb3503_probe(struct usb3503 *hub)
> else
> flags = GPIOD_OUT_HIGH;
> hub->intn = devm_gpiod_get_optional(dev, "intn", flags);
> - if (IS_ERR(hub->intn))
> + if (IS_ERR(hub->intn)) {
> + if (is_clk_enable)
> + clk_disable_unprepare(hub->clk);
> return PTR_ERR(hub->intn);
This is getting messy, any way to make a common error handler at the
bottom of the function instead? That's the common kernel coding style
for this type of thing.
thanks,
greg k-h
next prev parent reply other threads:[~2022-09-07 14:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-03 7:15 [PATCH] usb: misc: usb3503: call clk_disable_unprepare in the error handling Dongliang Mu
2022-09-07 14:25 ` Greg Kroah-Hartman [this message]
2022-09-08 6:01 ` Dongliang Mu
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=Yxip0d2bBOi/CB4P@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=dzm91@hust.edu.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mudongliangabcd@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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