Merge tag 'sched-urgent-2020-11-22' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / watchdog / rdc321x_wdt.c

diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index 57187ef..f0c94ea 100644 (file)
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -231,6 +231,8 @@ static int rdc321x_wdt_probe(struct platform_device *pdev)
 
        rdc321x_wdt_device.sb_pdev = pdata->sb_pdev;
        rdc321x_wdt_device.base_reg = r->start;
+       rdc321x_wdt_device.queue = 0;
+       rdc321x_wdt_device.default_ticks = ticks;
 
        err = misc_register(&rdc321x_wdt_misc);
        if (err < 0) {
@@ -245,14 +247,11 @@ static int rdc321x_wdt_probe(struct platform_device *pdev)
                                rdc321x_wdt_device.base_reg, RDC_WDT_RST);
 
        init_completion(&rdc321x_wdt_device.stop);
-       rdc321x_wdt_device.queue = 0;
 
        clear_bit(0, &rdc321x_wdt_device.inuse);
 
        timer_setup(&rdc321x_wdt_device.timer, rdc321x_wdt_trigger, 0);
 
-       rdc321x_wdt_device.default_ticks = ticks;
-
        dev_info(&pdev->dev, "watchdog init success\n");
 
        return 0;