[PATCH] ARM: OMAP1: ams-delta: fix early boot crash when LED support is disabled

[PATCH] ARM: OMAP1: ams-delta: fix early boot crash when LED support is disabled

[Aaro Koskinen]

When we boot with the LED support (CONFIG_NEW_LEDS) disabled,
gpio_led_register_device() will return a NULL pointer and we try
to dereference it. Fix by checking also for a NULL pointer.

Fixes: 19a2668a8ae3 ("ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED device")
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 arch/arm/mach-omap1/board-ams-delta.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index c4c0a8ea11e4..2b3d1197bb19 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -749,7 +749,7 @@ static void __init ams_delta_init(void)
 				ARRAY_SIZE(ams_delta_gpio_tables));
 
 	leds_pdev = gpio_led_register_device(PLATFORM_DEVID_NONE, &leds_pdata);
-	if (!IS_ERR(leds_pdev)) {
+	if (!IS_ERR_OR_NULL(leds_pdev)) {
 		leds_gpio_table.dev_id = dev_name(&leds_pdev->dev);
 		gpiod_add_lookup_table(&leds_gpio_table);
 	}
-- 
2.17.0

Re: [PATCH] ARM: OMAP1: ams-delta: fix early boot crash when LED support is disabled

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 578 bytes --]

On Tue 2019-04-16 02:37:32, Aaro Koskinen wrote:
> When we boot with the LED support (CONFIG_NEW_LEDS) disabled,
> gpio_led_register_device() will return a NULL pointer and we try
> to dereference it. Fix by checking also for a NULL pointer.
> 
> Fixes: 19a2668a8ae3 ("ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED device")
> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>

Acked-by: Pavel Machek <pavel@ucw.cz>

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH] ARM: OMAP1: ams-delta: fix early boot crash when LED support is disabled

[Tony Lindgren]

* Pavel Machek <pavel@ucw.cz> [190416 07:14]:
> On Tue 2019-04-16 02:37:32, Aaro Koskinen wrote:
> > When we boot with the LED support (CONFIG_NEW_LEDS) disabled,
> > gpio_led_register_device() will return a NULL pointer and we try
> > to dereference it. Fix by checking also for a NULL pointer.
> > 
> > Fixes: 19a2668a8ae3 ("ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED device")
> > Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> 
> Acked-by: Pavel Machek <pavel@ucw.cz>

Applying into omap-for-v5.1/fixes thanks.

Tony