diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2016-03-03 09:24:12 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2016-03-16 21:09:16 +0100 |
| commit | 84b84bcf4f718b7b9f5296d4068025fea801a0e1 (patch) | |
| tree | e6f039e2e02679d26a63c4757245cf8aa4281c8f /drivers/watchdog | |
| parent | ccc8208d0855a5b02a4fc49c141b6f1dbf282304 (diff) | |
| download | talos-obmc-linux-84b84bcf4f718b7b9f5296d4068025fea801a0e1.tar.gz talos-obmc-linux-84b84bcf4f718b7b9f5296d4068025fea801a0e1.zip | |
watchdog: tangox_wdt: test clock rate to avoid division by 0
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>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/tangox_wdt.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/watchdog/tangox_wdt.c b/drivers/watchdog/tangox_wdt.c index 709c1ed6fd79..cfbed7e051b6 100644 --- a/drivers/watchdog/tangox_wdt.c +++ b/drivers/watchdog/tangox_wdt.c @@ -139,6 +139,10 @@ static int tangox_wdt_probe(struct platform_device *pdev) return err; dev->clk_rate = clk_get_rate(dev->clk); + if (!dev->clk_rate) { + err = -EINVAL; + goto err; + } dev->wdt.parent = &pdev->dev; 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); - if (err) { - clk_disable_unprepare(dev->clk); - return err; - } + if (err) + goto err; 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"); return 0; + + err: + clk_disable_unprepare(dev->clk); + return err; } static int tangox_wdt_remove(struct platform_device *pdev) |
