On Sat, May 29, 2021 at 10:29:53AM +0200, Ahmad Fatoum wrote:
> Align the return code with Linux, where the function returns 0, not the
> device name length on success. No functional change, as no one checks
> the error code anyway.
> 
> Signed-off-by: Ahmad Fatoum <[email protected]>
> ---
>  drivers/base/driver.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/base/driver.c b/drivers/base/driver.c
> index f60533c59eb1..1fa3f6c6fac0 100644
> --- a/drivers/base/driver.c
> +++ b/drivers/base/driver.c
> @@ -480,9 +480,7 @@ int dev_set_name(struct device_d *dev, const char *fmt, 
> ...)
>        */
>       free(oldname);
>  
> -     WARN_ON(err < 0);
> -
> -     return err;
> +     return WARN_ON(err < 0) ? err : 0;
>  }
>  EXPORT_SYMBOL_GPL(dev_set_name);
>  
> -- 
> 2.31.1
> 
> 
> _______________________________________________
> barebox mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Reply via email to