Commit 4c8f27ba authored by Sven Peter's avatar Sven Peter Committed by Greg Kroah-Hartman
Browse files

usb: typec: tipd: Fix typec_unregister_port error paths 



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

Fixes: 92440202 ("usb: typec: tipd: Only update power status on IRQ")
Signed-off-by: default avatarSven Peter <sven@svenpeter.dev>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20221114174449.34634-3-sven@svenpeter.dev


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 782c70ed

drivers/usb/typec/tipd/core.c

+4 −3
Original line number Diff line number Diff line
@@ -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: