summaryrefslogtreecommitdiff
path: root/drivers/leds
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2007-05-11 02:46:30 +0400
committerRichard Purdie <rpurdie@rpsys.net>2007-07-16 04:15:50 +0400
commit3593a6d64d774efb9d7ec80947607401ee6731c0 (patch)
tree5e1a05877dc385b9d74ef40c5168b567c54e70bd /drivers/leds
parent66242f7ec531953fbc2f4040c5ffe1f1ffe6c5c9 (diff)
downloadlinux-3593a6d64d774efb9d7ec80947607401ee6731c0.tar.xz
leds: Fix trigger unregister_simple if register_simple fails
Fix led_trigger_unregister_simple to handle the case where led_trigger_register_simple fails, avoiding a NULL pointer dereference. Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/led-triggers.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c
index 454fb0901f82..129733f2379b 100644
--- a/drivers/leds/led-triggers.c
+++ b/drivers/leds/led-triggers.c
@@ -215,7 +215,8 @@ void led_trigger_unregister(struct led_trigger *trigger)
void led_trigger_unregister_simple(struct led_trigger *trigger)
{
- led_trigger_unregister(trigger);
+ if (trigger)
+ led_trigger_unregister(trigger);
kfree(trigger);
}