From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Felix Gu <ustc.gu@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sebastian Reichel <sebastian.reichel@collabora.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] usb: typec: fusb302: Fix resource leak when devm_drm_dp_hpd_bridge_add() fails
Date: Mon, 27 Apr 2026 12:20:07 +0300 [thread overview]
Message-ID: <ae8qRz2wDBcHkSKm@kuha> (raw)
In-Reply-To: <20260421-fusb-v1-1-0a9dd64e785b@gmail.com>
On Tue, Apr 21, 2026 at 07:24:56PM +0800, Felix Gu wrote:
> If devm_drm_dp_hpd_bridge_add() fails during fusb302_probe(), the original
> code returned directly without cleaning up the resources.
>
> Route the failure through the existing unwind path so probe cleans up the
> same resources that are released in remove().
>
> Fixes: 5d79c525405d ("usb: typec: fusb302: add DRM DP HPD bridge support")
> Signed-off-by: Felix Gu <ustc.gu@gmail.com>
> ---
> drivers/usb/typec/tcpm/fusb302.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
> index 889c4c29c1b8..5b631422c128 100644
> --- a/drivers/usb/typec/tcpm/fusb302.c
> +++ b/drivers/usb/typec/tcpm/fusb302.c
> @@ -1776,10 +1776,15 @@ static int fusb302_probe(struct i2c_client *client)
>
> ret = devm_drm_dp_hpd_bridge_add(chip->dev, bridge_dev);
> if (ret)
> - return ret;
> + goto free_irq;
Couldn't you just call that before requesting the irq?
thanks,
> - return ret;
> + return 0;
>
> +free_irq:
> + disable_irq_wake(chip->gpio_int_n_irq);
> + free_irq(chip->gpio_int_n_irq, chip);
> + cancel_work_sync(&chip->irq_work);
> + cancel_delayed_work_sync(&chip->bc_lvl_handler);
> tcpm_unregister_port:
> tcpm_unregister_port(chip->tcpm_port);
> fwnode_handle_put(chip->tcpc_dev.fwnode);
>
> ---
> base-commit: 97e797263a5e963da3d1e66e743fd518567dfe37
> change-id: 20260421-fusb-0e7085ce431a
>
> Best regards,
> --
> Felix Gu <ustc.gu@gmail.com>
--
heikki
prev parent reply other threads:[~2026-04-27 9:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-21 11:24 [PATCH] usb: typec: fusb302: Fix resource leak when devm_drm_dp_hpd_bridge_add() fails Felix Gu
2026-04-27 9:20 ` Heikki Krogerus [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=ae8qRz2wDBcHkSKm@kuha \
--to=heikki.krogerus@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=sebastian.reichel@collabora.com \
--cc=ustc.gu@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