net: bgmac: Fix return value check for fixed_phy_register()

[linux.git] / drivers / leds / trigger / ledtrig-pattern.c

diff --git a/drivers/leds/trigger/ledtrig-pattern.c b/drivers/leds/trigger/ledtrig-pattern.c
index 885ca63f383fb4d27af588043582c69c6ea3a822..fadd87dbe9930557f550fcfd66d269504acc082b 100644 (file)
--- a/drivers/leds/trigger/ledtrig-pattern.c
+++ b/drivers/leds/trigger/ledtrig-pattern.c
@@ -430,7 +430,7 @@ static void pattern_trig_deactivate(struct led_classdev *led_cdev)
        if (led_cdev->pattern_clear)
                led_cdev->pattern_clear(led_cdev);
 
-       del_timer_sync(&data->timer);
+       timer_shutdown_sync(&data->timer);
 
        led_set_brightness(led_cdev, LED_OFF);
        kfree(data);