Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <aee8b25a-217d-a63c-d2b9-3b7a9c4cd248@linaro.org>
Date:   Mon, 31 Jul 2023 10:38:56 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.12.0
From:   Neil Armstrong <neil.armstrong@linaro.org>
Reply-To: neil.armstrong@linaro.org
Subject: Re: [PATCH] usb: typec: nb7vpq904m: Add an error handling path in
 nb7vpq904m_probe()
Content-Language: en-US
To:     Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
        Heikki Krogerus <heikki.krogerus@linux.intel.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc:     linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
        linux-usb@vger.kernel.org
References: <9118954765821ea9f1179883602b4eca63e91749.1689716381.git.christophe.jaillet@wanadoo.fr>
Organization: Linaro Developer Services
In-Reply-To: <9118954765821ea9f1179883602b4eca63e91749.1689716381.git.christophe.jaillet@wanadoo.fr>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 18/07/2023 23:40, Christophe JAILLET wrote:
> In case of error in the nb7vpq904m_probe() probe function, some resources
> need to be freed, as already done in the remove function.
> 
> Add the missing error handling path and adjust code accordingly.
> 
> Fixes: 88d8f3ac9c67 ("usb: typec: add support for the nb7vpq904m Type-C Linear Redriver")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> This changes the order with some devm_ allocated resources. I hope this is
> fine. At least it is consistent with the remove function.
> ---
>   drivers/usb/typec/mux/nb7vpq904m.c | 25 ++++++++++++++++++-------
>   1 file changed, 18 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/usb/typec/mux/nb7vpq904m.c b/drivers/usb/typec/mux/nb7vpq904m.c
> index 80e580d50129..4d1122d95013 100644
> --- a/drivers/usb/typec/mux/nb7vpq904m.c
> +++ b/drivers/usb/typec/mux/nb7vpq904m.c
> @@ -463,16 +463,18 @@ static int nb7vpq904m_probe(struct i2c_client *client)
>   
>   	ret = nb7vpq904m_register_bridge(nb7);
>   	if (ret)
> -		return ret;
> +		goto err_disable_gpio;
>   
>   	sw_desc.drvdata = nb7;
>   	sw_desc.fwnode = dev->fwnode;
>   	sw_desc.set = nb7vpq904m_sw_set;
>   
>   	nb7->sw = typec_switch_register(dev, &sw_desc);
> -	if (IS_ERR(nb7->sw))
> -		return dev_err_probe(dev, PTR_ERR(nb7->sw),
> -				     "Error registering typec switch\n");
> +	if (IS_ERR(nb7->sw)) {
> +		ret = dev_err_probe(dev, PTR_ERR(nb7->sw),
> +				    "Error registering typec switch\n");
> +		goto err_disable_gpio;
> +	}
>   
>   	retimer_desc.drvdata = nb7;
>   	retimer_desc.fwnode = dev->fwnode;
> @@ -480,12 +482,21 @@ static int nb7vpq904m_probe(struct i2c_client *client)
>   
>   	nb7->retimer = typec_retimer_register(dev, &retimer_desc);
>   	if (IS_ERR(nb7->retimer)) {
> -		typec_switch_unregister(nb7->sw);
> -		return dev_err_probe(dev, PTR_ERR(nb7->retimer),
> -				     "Error registering typec retimer\n");
> +		ret = dev_err_probe(dev, PTR_ERR(nb7->retimer),
> +				    "Error registering typec retimer\n");
> +		goto err_switch_unregister;
>   	}
>   
>   	return 0;
> +
> +err_switch_unregister:
> +	typec_switch_unregister(nb7->sw);
> +
> +err_disable_gpio:
> +	gpiod_set_value(nb7->enable_gpio, 0);
> +	regulator_disable(nb7->vcc_supply);
> +
> +	return ret;
>   }
>   
>   static void nb7vpq904m_remove(struct i2c_client *client)


Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>