Commit b9a0866a authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

usb: typec: ucsi: Put fwnode in any case during ->probe() 



device_for_each_child_node() bumps a reference counting of a returned variable.
We have to balance it whenever we return to the caller.

Fixes: c1b0bc2d ("usb: typec: Add support for UCSI interface")
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20210504222337.3151726-1-andy.shevchenko@gmail.com


Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e2b8d15

drivers/usb/typec/ucsi/ucsi.c

+4 −1
Original line number Diff line number Diff line
@@ -999,6 +999,7 @@ static const struct typec_operations ucsi_ops = { 
	.pr_set = ucsi_pr_swap

};



/* Caller must call fwnode_handle_put() after use */

static struct fwnode_handle *ucsi_find_fwnode(struct ucsi_connector *con)

{

	struct fwnode_handle *fwnode;
@@ -1033,7 +1034,7 @@ static int ucsi_register_port(struct ucsi *ucsi, int index) 
	command |= UCSI_CONNECTOR_NUMBER(con->num);

	ret = ucsi_send_command(ucsi, command, &con->cap, sizeof(con->cap));

	if (ret < 0)

		goto out;

		goto out_unlock;



	if (con->cap.op_mode & UCSI_CONCAP_OPMODE_DRP)

		cap->data = TYPEC_PORT_DRD;
@@ -1151,6 +1152,8 @@ static int ucsi_register_port(struct ucsi *ucsi, int index) 
	trace_ucsi_register_port(con->num, &con->status);



out:

	fwnode_handle_put(cap->fwnode);

out_unlock:

	mutex_unlock(&con->lock);

	return ret;

}