Skip to content

Commit

Permalink
usb: typec: tipd: Fix typec_unregister_port error paths
Browse files Browse the repository at this point in the history
[ Upstream commit 4c8f27b ]

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

Fixes: 9244020 ("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>
  • Loading branch information
svenpeter42 authored and gregkh committed Dec 31, 2022
1 parent 63fff60 commit 20a9452
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/usb/typec/tipd/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -839,15 +839,16 @@ 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);
fwnode_handle_put(fwnode);

return 0;

err_unregister_port:
typec_unregister_port(tps->port);
err_role_put:
usb_role_switch_put(tps->role_sw);
err_fwnode_put:
Expand Down

0 comments on commit 20a9452

Please sign in to comment.