2022-05-11 19:32:46

by Zheng Bin

Subject: [PATCH -next] ARM: davinci: da850-evm: add missing platform_device_unregister in da850_lcd_hw_init

da850_lcd_hw_init misses a call platform_device_unregister in error path,
this patch fixes that.

Signed-off-by: Zheng Bin <[email protected]>
---
arch/arm/mach-davinci/board-da850-evm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index efc26b472ef8..7b2a1a37e5c0 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -873,8 +873,10 @@ static int da850_lcd_hw_init(void)
return PTR_ERR(backlight);

status = platform_device_register(&da850_lcd_supply_device);
- if (status)
+ if (status) {
+ platform_device_unregister(backlight);
return status;
+ }

return 0;
}
--
2.31.1

2022-05-15 12:44:59

by Bartosz Golaszewski

Subject: Re: [PATCH -next] ARM: davinci: da850-evm: add missing platform_device_unregister in da850_lcd_hw_init

On Wed, May 11, 2022 at 10:51 AM Zheng Bin <[email protected]> wrote:
>
> da850_lcd_hw_init misses a call platform_device_unregister in error path,
> this patch fixes that.
>
> Signed-off-by: Zheng Bin <[email protected]>
> ---
> arch/arm/mach-davinci/board-da850-evm.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
> index efc26b472ef8..7b2a1a37e5c0 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -873,8 +873,10 @@ static int da850_lcd_hw_init(void)
> return PTR_ERR(backlight);
>
> status = platform_device_register(&da850_lcd_supply_device);
> - if (status)
> + if (status) {
> + platform_device_unregister(backlight);
> return status;
> + }
>
> return 0;
> }
> --
> 2.31.1
>

Reviewed-by: Bartosz Golaszewski <[email protected]>