Skip to content

Commit f6115ec

Browse files
anholtgregkh
authored andcommitted
watchdog: bcm281xx: Fix use of uninitialized spinlock.
commit fedf266f9955d9a019643cde199a2fd9a0259f6f upstream. The bcm_kona_wdt_set_resolution_reg() call takes the spinlock, so initialize it earlier. Fixes a warning at boot with lock debugging enabled. Fixes: 6adb730 ("watchdog: bcm281xx: Watchdog Driver") Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f99737c commit f6115ec

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/watchdog/bcm_kona_wdt.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,8 @@ static int bcm_kona_wdt_probe(struct platform_device *pdev)
304304
if (!wdt)
305305
return -ENOMEM;
306306

307+
spin_lock_init(&wdt->lock);
308+
307309
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
308310
wdt->base = devm_ioremap_resource(dev, res);
309311
if (IS_ERR(wdt->base))
@@ -316,7 +318,6 @@ static int bcm_kona_wdt_probe(struct platform_device *pdev)
316318
return ret;
317319
}
318320

319-
spin_lock_init(&wdt->lock);
320321
platform_set_drvdata(pdev, wdt);
321322
watchdog_set_drvdata(&bcm_kona_wdt_wdd, wdt);
322323
bcm_kona_wdt_wdd.parent = &pdev->dev;

0 commit comments

Comments
 (0)