fbdev: sm712fb: fix boot screen glitch when sm712fb replaces VGA

[mirror_ubuntu-bionic-kernel.git] / drivers / rtc / rtc-brcmstb-waketimer.c

diff --git a/drivers/rtc/rtc-brcmstb-waketimer.c b/drivers/rtc/rtc-brcmstb-waketimer.c
index 796ac792a381f4e0e8ecaeb7667a5180e2d9b843..6cee61201c30cb4a15eef3fbd72a7df57313e04b 100644 (file)
--- a/drivers/rtc/rtc-brcmstb-waketimer.c
+++ b/drivers/rtc/rtc-brcmstb-waketimer.c
@@ -253,7 +253,7 @@ static int brcmstb_waketmr_probe(struct platform_device *pdev)
        ret = devm_request_irq(dev, timer->irq, brcmstb_waketmr_irq, 0,
                               "brcmstb-waketimer", timer);
        if (ret < 0)
-               return ret;
+               goto err_clk;
 
        timer->reboot_notifier.notifier_call = brcmstb_waketmr_reboot;
        register_reboot_notifier(&timer->reboot_notifier);
@@ -262,12 +262,21 @@ static int brcmstb_waketmr_probe(struct platform_device *pdev)
                                         &brcmstb_waketmr_ops, THIS_MODULE);
        if (IS_ERR(timer->rtc)) {
                dev_err(dev, "unable to register device\n");
-               unregister_reboot_notifier(&timer->reboot_notifier);
-               return PTR_ERR(timer->rtc);
+               ret = PTR_ERR(timer->rtc);
+               goto err_notifier;
        }
 
        dev_info(dev, "registered, with irq %d\n", timer->irq);
 
+       return 0;
+
+err_notifier:
+       unregister_reboot_notifier(&timer->reboot_notifier);
+
+err_clk:
+       if (timer->clk)
+               clk_disable_unprepare(timer->clk);
+
        return ret;
 }