Commit 57337db1 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Wim Van Sebroeck

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: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 04b1a62e
...@@ -208,14 +208,15 @@ static int a21_wdt_probe(struct platform_device *pdev) ...@@ -208,14 +208,15 @@ static int a21_wdt_probe(struct platform_device *pdev)
else if (reset == 7) else if (reset == 7)
a21_wdt.bootstatus |= WDIOF_EXTERN2; a21_wdt.bootstatus |= WDIOF_EXTERN2;
drv->wdt = a21_wdt;
dev_set_drvdata(&pdev->dev, drv);
ret = watchdog_register_device(&a21_wdt); ret = watchdog_register_device(&a21_wdt);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Cannot register watchdog device\n"); dev_err(&pdev->dev, "Cannot register watchdog device\n");
goto err_register_wd; goto err_register_wd;
} }
dev_set_drvdata(&pdev->dev, drv);
dev_info(&pdev->dev, "MEN A21 watchdog timer driver enabled\n"); dev_info(&pdev->dev, "MEN A21 watchdog timer driver enabled\n");
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment