Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-08 14:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

watchdog: tangox_wdt: test clock rate to avoid division by 0

Browse Source 
The clk API may return 0 on clk_get_rate, so we should check the result before
using it as a divisor. For this, refactor the code to use a central
error path.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Wolfram Sang 2016-03-03 09:24:12 +01:00 committed by Wim Van Sebroeck
parent ccc8208d08
commit 84b84bcf4f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/watchdog/tangox_wdt.c
View File

@ -139,6 +139,10 @@ static int tangox_wdt_probe(struct platform_device *pdev)
return err; return err;
dev->clk_rate = clk_get_rate(dev->clk); dev->clk_rate = clk_get_rate(dev->clk);
if (!dev->clk_rate) {
err = -EINVAL;
goto err;
}
dev->wdt.parent = &pdev->dev; dev->wdt.parent = &pdev->dev;
dev->wdt.info = &tangox_wdt_info; dev->wdt.info = &tangox_wdt_info;
@ -171,10 +175,8 @@ static int tangox_wdt_probe(struct platform_device *pdev)
} }
err = watchdog_register_device(&dev->wdt); err = watchdog_register_device(&dev->wdt);
if (err) { if (err)
clk_disable_unprepare(dev->clk); goto err;
return err;
}
platform_set_drvdata(pdev, dev); platform_set_drvdata(pdev, dev);
@ -187,6 +189,10 @@ static int tangox_wdt_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "SMP86xx/SMP87xx watchdog registered\n"); dev_info(&pdev->dev, "SMP86xx/SMP87xx watchdog registered\n");
return 0; return 0;
err:
clk_disable_unprepare(dev->clk);
return err;
} }
static int tangox_wdt_remove(struct platform_device *pdev) static int tangox_wdt_remove(struct platform_device *pdev)