From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Bjorn Andersson <andersson@kernel.org>,
Luca Weiss <luca.weiss@fairphone.com>,
linux-arm-msm@vger.kernel.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/4] usb: typec-mux: nb7vpq904m: unregister typec switch on probe error and remove
Date: Mon, 10 Jun 2024 16:02:45 +0300 [thread overview]
Message-ID: <Zmb5dVRz46szJtHc@kuha.fi.intel.com> (raw)
In-Reply-To: <20240606-topic-sm8x50-upstream-retimer-broadcast-mode-v2-2-c6f6eae479c3@linaro.org>
On Thu, Jun 06, 2024 at 03:11:14PM +0200, Neil Armstrong wrote:
> Add the missing call to typec_switch_put() when probe fails and
> the nb7vpq904m_remove() call is called.
>
> Fixes: 348359e7c232 ("usb: typec: nb7vpq904m: Add an error handling path in nb7vpq904m_probe()")
> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/usb/typec/mux/nb7vpq904m.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/typec/mux/nb7vpq904m.c b/drivers/usb/typec/mux/nb7vpq904m.c
> index ed93194b16cf..569f1162ee2e 100644
> --- a/drivers/usb/typec/mux/nb7vpq904m.c
> +++ b/drivers/usb/typec/mux/nb7vpq904m.c
> @@ -415,7 +415,7 @@ static int nb7vpq904m_probe(struct i2c_client *client)
>
> ret = nb7vpq904m_parse_data_lanes_mapping(nb7);
> if (ret)
> - return ret;
> + goto err_switch_put;
>
> ret = regulator_enable(nb7->vcc_supply);
> if (ret)
> @@ -458,6 +458,9 @@ static int nb7vpq904m_probe(struct i2c_client *client)
> gpiod_set_value(nb7->enable_gpio, 0);
> regulator_disable(nb7->vcc_supply);
>
> +err_switch_put:
> + typec_switch_put(nb7->typec_switch);
> +
> return ret;
> }
>
> @@ -471,6 +474,8 @@ static void nb7vpq904m_remove(struct i2c_client *client)
> gpiod_set_value(nb7->enable_gpio, 0);
>
> regulator_disable(nb7->vcc_supply);
> +
> + typec_switch_put(nb7->typec_switch);
> }
>
> static const struct i2c_device_id nb7vpq904m_table[] = {
>
> --
> 2.34.1
--
heikki
next prev parent reply other threads:[~2024-06-10 13:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-06 13:11 [PATCH v2 0/4] usb: typec-mux: broadcast typec state to next mux for ptn36502 & nb7vpq904m retimers Neil Armstrong
2024-06-06 13:11 ` [PATCH v2 1/4] usb: typec-mux: ptn36502: unregister typec switch on probe error and remove Neil Armstrong
2024-06-07 5:48 ` Dmitry Baryshkov
2024-06-10 12:51 ` Heikki Krogerus
2024-06-06 13:11 ` [PATCH v2 2/4] usb: typec-mux: nb7vpq904m: " Neil Armstrong
2024-06-07 5:50 ` Dmitry Baryshkov
2024-06-07 14:00 ` Neil Armstrong
2024-06-07 14:49 ` Dmitry Baryshkov
2024-06-10 13:02 ` Heikki Krogerus [this message]
2024-06-06 13:11 ` [PATCH v2 3/4] usb: typec-mux: ptn36502: broadcast typec state to next mux Neil Armstrong
2024-06-07 5:51 ` Dmitry Baryshkov
2024-06-10 13:04 ` Heikki Krogerus
2024-06-06 13:11 ` [PATCH v2 4/4] usb: typec-mux: nb7vpq904m: " Neil Armstrong
2024-06-07 5:55 ` Dmitry Baryshkov
2024-06-10 13:06 ` Heikki Krogerus
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=Zmb5dVRz46szJtHc@kuha.fi.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=andersson@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=luca.weiss@fairphone.com \
--cc=neil.armstrong@linaro.org \
/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