diff options
| author | Johannes Thumshirn <jthumshirn@suse.de> | 2015-06-02 12:25:26 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2015-06-22 15:54:32 +0200 |
| commit | 57337db1b9f96b897d2404531d8b6375667723fa (patch) | |
| tree | 6e50b771d9b5f13129678fa6bf2b96d3043a3f18 /drivers/watchdog/mena21_wdt.c | |
| parent | watchdog: dw_wdt: keepalive the watchdog at write time (diff) | |
| download | linux-57337db1b9f96b897d2404531d8b6375667723fa.tar.xz linux-57337db1b9f96b897d2404531d8b6375667723fa.zip | |
watchdog: mena21_wdt: Fix possible NULL pointer dereference
In a21_wdt_remove() we do a watchdog_unregister_device() on struct
a21_wdt_drv->wdt but never assign it.
Also move the dev_set_drvdata() call in front of the watchdog_register_device()
call, so it doesn't look like an error.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/mena21_wdt.c')
| -rw-r--r-- | drivers/watchdog/mena21_wdt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c index 96dbba980579..d193a5e79c38 100644 --- a/drivers/watchdog/mena21_wdt.c +++ b/drivers/watchdog/mena21_wdt.c @@ -208,14 +208,15 @@ static int a21_wdt_probe(struct platform_device *pdev) else if (reset == 7) a21_wdt.bootstatus |= WDIOF_EXTERN2; + drv->wdt = a21_wdt; + dev_set_drvdata(&pdev->dev, drv); + ret = watchdog_register_device(&a21_wdt); if (ret) { dev_err(&pdev->dev, "Cannot register watchdog device\n"); goto err_register_wd; } - dev_set_drvdata(&pdev->dev, drv); - dev_info(&pdev->dev, "MEN A21 watchdog timer driver enabled\n"); return 0; |