| From fedf266f9955d9a019643cde199a2fd9a0259f6f Mon Sep 17 00:00:00 2001 |
| From: Eric Anholt <eric@anholt.net> |
| Date: Thu, 27 Apr 2017 18:02:32 -0700 |
| Subject: watchdog: bcm281xx: Fix use of uninitialized spinlock. |
| |
| From: Eric Anholt <eric@anholt.net> |
| |
| 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: 6adb730dc208 ("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> |
| |
| --- |
| drivers/watchdog/bcm_kona_wdt.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/watchdog/bcm_kona_wdt.c |
| +++ b/drivers/watchdog/bcm_kona_wdt.c |
| @@ -299,6 +299,8 @@ static int bcm_kona_wdt_probe(struct pla |
| if (!wdt) |
| return -ENOMEM; |
| |
| + spin_lock_init(&wdt->lock); |
| + |
| res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| wdt->base = devm_ioremap_resource(dev, res); |
| if (IS_ERR(wdt->base)) |
| @@ -311,7 +313,6 @@ static int bcm_kona_wdt_probe(struct pla |
| return ret; |
| } |
| |
| - spin_lock_init(&wdt->lock); |
| platform_set_drvdata(pdev, wdt); |
| watchdog_set_drvdata(&bcm_kona_wdt_wdd, wdt); |
| |
