Re: [PATCH v4 3/7] usb: typec: mux: Check dev_set_name() return value

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Sun, Mar 06, 2022 at 07:40:36PM -0800, Bjorn Andersson wrote:
> It's possible that dev_set_name() returns -ENOMEM, catch and handle this.

Thanks!
Shouldn't we have a Fixes tag and be sent separately for this cycle?

> Reported-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> ---
> 
> Changes since v3:
> - New patch
> 
>  drivers/usb/typec/mux.c | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/usb/typec/mux.c b/drivers/usb/typec/mux.c
> index c8340de0ed49..d2aaf294b649 100644
> --- a/drivers/usb/typec/mux.c
> +++ b/drivers/usb/typec/mux.c
> @@ -131,8 +131,11 @@ typec_switch_register(struct device *parent,
>  	sw->dev.class = &typec_mux_class;
>  	sw->dev.type = &typec_switch_dev_type;
>  	sw->dev.driver_data = desc->drvdata;
> -	dev_set_name(&sw->dev, "%s-switch",
> -		     desc->name ? desc->name : dev_name(parent));
> +	ret = dev_set_name(&sw->dev, "%s-switch", desc->name ? desc->name : dev_name(parent));

We may use shorten form of the ternary

	ret = dev_set_name(&sw->dev, "%s-switch", desc->name ?: dev_name(parent));

at the same time, but it's up to you.

Either way code looks good to me,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>

> +	if (ret) {
> +		put_device(&sw->dev);
> +		return ERR_PTR(ret);
> +	}
>  
>  	ret = device_add(&sw->dev);
>  	if (ret) {
> @@ -338,8 +341,11 @@ typec_mux_register(struct device *parent, const struct typec_mux_desc *desc)
>  	mux->dev.class = &typec_mux_class;
>  	mux->dev.type = &typec_mux_dev_type;
>  	mux->dev.driver_data = desc->drvdata;
> -	dev_set_name(&mux->dev, "%s-mux",
> -		     desc->name ? desc->name : dev_name(parent));
> +	ret = dev_set_name(&mux->dev, "%s-mux", desc->name ? desc->name : dev_name(parent));

Ditto.

> +	if (ret) {
> +		put_device(&mux->dev);
> +		return ERR_PTR(ret);
> +	}
>  
>  	ret = device_add(&mux->dev);
>  	if (ret) {
> -- 
> 2.33.1
> 

-- 
With Best Regards,
Andy Shevchenko





[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]


  Powered by Linux