From: Sven Peter <sven@svenpeter.dev>
To: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Sven Peter <sven@svenpeter.dev>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] usb: typec: tipd: Move tps6598x_disconnect error path to its own label
Date: Mon, 14 Nov 2022 18:44:49 +0100 [thread overview]
Message-ID: <20221114174449.34634-4-sven@svenpeter.dev> (raw)
In-Reply-To: <20221114174449.34634-1-sven@svenpeter.dev>
While the code currently correctly calls tps6598x_disconnect before jumping
to the error cleanup label it's inconsistent compared to all the other cleanup
actions and prone to introduce bugs if any more resources are added.
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/usb/typec/tipd/core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index c35501a92b4d..22ff212e05e6 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -850,16 +850,16 @@ static int tps6598x_probe(struct i2c_client *client)
irq_handler,
IRQF_SHARED | IRQF_ONESHOT,
dev_name(&client->dev), tps);
- if (ret) {
- tps6598x_disconnect(tps, 0);
- goto err_unregister_port;
- }
+ if (ret)
+ goto err_disconnect;
i2c_set_clientdata(client, tps);
fwnode_handle_put(fwnode);
return 0;
+err_disconnect:
+ tps6598x_disconnect(tps, 0);
err_unregister_port:
typec_unregister_port(tps->port);
err_role_put:
--
2.25.1
next prev parent reply other threads:[~2022-11-14 17:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-14 17:44 [PATCH 1/4] usb: typec: tipd: Cleanup resources if devm_tps6598_psy_register fails Sven Peter
2022-11-14 17:44 ` [PATCH 2/4] usb: typec: tipd: Fix spurious fwnode_handle_put in error path Sven Peter
2022-11-16 12:16 ` Heikki Krogerus
2022-11-14 17:44 ` [PATCH 3/4] usb: typec: tipd: Fix typec_unregister_port error paths Sven Peter
2022-11-16 12:20 ` Heikki Krogerus
2022-11-14 17:44 ` Sven Peter [this message]
2022-11-16 12:30 ` [PATCH 4/4] usb: typec: tipd: Move tps6598x_disconnect error path to its own label Heikki Krogerus
2022-11-16 12:13 ` [PATCH 1/4] usb: typec: tipd: Cleanup resources if devm_tps6598_psy_register fails 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=20221114174449.34634-4-sven@svenpeter.dev \
--to=sven@svenpeter.dev \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.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