[PATCH v1 1/1] usb: typec: ucsi: Put fwnode in any case during ->probe()

[PATCH v1 1/1] usb: typec: ucsi: Put fwnode in any case during ->probe()

[Andy Shevchenko]

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: c1b0bc2dabfa ("usb: typec: Add support for UCSI interface")
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
 drivers/usb/typec/ucsi/ucsi.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index 282c3c825c13..0e1cec346e0f 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -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;
 }
-- 
2.31.1

Re: [PATCH v1 1/1] usb: typec: ucsi: Put fwnode in any case during ->probe()

[Heikki Krogerus]

Hi Andy,

On Wed, May 05, 2021 at 01:23:37AM +0300, Andy Shevchenko wrote:
> 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: c1b0bc2dabfa ("usb: typec: Add support for UCSI interface")
> Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> ---
>  drivers/usb/typec/ucsi/ucsi.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
> index 282c3c825c13..0e1cec346e0f 100644
> --- a/drivers/usb/typec/ucsi/ucsi.c
> +++ b/drivers/usb/typec/ucsi/ucsi.c
> @@ -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;
>  }
> -- 
> 2.31.1

thanks,

-- 
heikki