Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84b84bcf authored by Wolfram Sang's avatar Wolfram Sang Committed by Wim Van Sebroeck
Browse files

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: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent ccc8208d

drivers/watchdog/tangox_wdt.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -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)