Skip to contentSkip to conversation

leds: trigger: panic: don't register panic notifier if creating the trigger failed

PATCH Superseded Heiner Kallweit 2 participants 2 messages Dec 9, 2023 – Dec 13, 2023 LED

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 leds: trigger: panic: don't register panic notifier if creating the trigger failed

It doesn't make sense to register the panic notifier if creating the panic trigger failed.

---
 drivers/leds/trigger/ledtrig-panic.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/leds/trigger/ledtrig-panic.c +4 -1
index 64abf2e91..72297a845 100644
@@ -64,10 +64,13 @@ static long led_panic_blink(int state)
 
 static int __init ledtrig_panic_init(void)
 {
+	led_trigger_register_simple("panic", &trigger);
+	if (!trigger)
+		return 0;
+
 	atomic_notifier_chain_register(&panic_notifier_list,
 				       &led_trigger_panic_nb);
 
-	led_trigger_register_simple("panic", &trigger);
 	panic_blink = led_panic_blink;
 	return 0;
 }
Signature · 1 line
2.43.0
maintainer
#1 lore raw
Quoted 13 lines · Heiner Kallweit

It doesn't make sense to register the panic notifier if creating the panic trigger failed.

---
 drivers/leds/trigger/ledtrig-panic.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/leds/trigger/ledtrig-panic.c +0 -0
index 64abf2e91..72297a845 100644

drivers/leds/trigger/ledtrig-panic.c static long led_panic_blink(int state) · line 69

Quoted 6 lines
drivers/leds/trigger/ledtrig-panic.c +3 -0
@@ -64,10 +64,13 @@ static long led_panic_blink(int state)
 
 static int __init ledtrig_panic_init(void)
 {
+	led_trigger_register_simple("panic", &trigger);
+	if (!trigger)
+		return 0;

It doesn't seem correct to return 0 on a known failure.

Quoted 11 lines
drivers/leds/trigger/ledtrig-panic.c +1 -1
+
 	atomic_notifier_chain_register(&panic_notifier_list,
 				       &led_trigger_panic_nb);
 
-	led_trigger_register_simple("panic", &trigger);
 	panic_blink = led_panic_blink;
 	return 0;
 }
Signature · 1 line
2.43.0
Signature · 1 line
Lee Jones [李琼斯]