usb: typec: tipd: Fix typec_unregister_port error paths

[ Upstream commit 4c8f27ba9ede0118cac9d775204f9b0ecdb877b0 ]

typec_unregister_port is only called for some error paths after
typec_register_port was successful. Ensure it's called in all
cases.

Fixes: 92440202a880 ("usb: typec: tipd: Only update power status on IRQ")
Signed-off-by: Sven Peter <sven@svenpeter.dev>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20221114174449.34634-3-sven@svenpeter.dev
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 59059310ba748c2efbd0ba2da3f6612764561435..195c9c16f817f8beccaa9f8a3dea71bdf60f73f6 100644 (file)
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -826,7 +826,7 @@ static int tps6598x_probe(struct i2c_client *client)
                ret = tps6598x_read16(tps, TPS_REG_POWER_STATUS, &tps->pwr_status);
                if (ret < 0) {
                        dev_err(tps->dev, "failed to read power status: %d\n", ret);
-                       goto err_role_put;
+                       goto err_unregister_port;
                }
                ret = tps6598x_connect(tps, status);
                if (ret)
@@ -839,8 +839,7 @@ static int tps6598x_probe(struct i2c_client *client)
                                        dev_name(&client->dev), tps);
        if (ret) {
                tps6598x_disconnect(tps, 0);
-               typec_unregister_port(tps->port);
-               goto err_role_put;
+               goto err_unregister_port;
        }
 
        i2c_set_clientdata(client, tps);
@@ -848,6 +847,8 @@ static int tps6598x_probe(struct i2c_client *client)
 
        return 0;
 
+err_unregister_port:
+       typec_unregister_port(tps->port);
 err_role_put:
        usb_role_switch_put(tps->role_sw);
 err_fwnode_put: