clk: Don't write error code into divider register (2316a7a3) · Commits · 戴 / test

Add a check for error returned by divider value calculation to avoid writing error code into hw register. Signed-off-by:

Jon Mayo <jmayo@nvidia.com> Fixes: ("clk: divider: Make generic for usage elsewhere") Signed-off-by:

drivers/clk/clk-divider.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -385,12 +385,14 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
		unsigned long parent_rate)
		{
		struct clk_divider *divider = to_clk_divider(hw);
		unsigned int value;
		int value;
		unsigned long flags = 0;
		u32 val;

		value = divider_get_val(rate, parent_rate, divider->table,
		divider->width, divider->flags);
		if (value < 0)
		return value;

		if (divider->lock)
		spin_lock_irqsave(divider->lock, flags);
		@@ -403,7 +405,7 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
		val = clk_readl(divider->reg);
		val &= ~(div_mask(divider->width) << divider->shift);
		}
		val \|= value << divider->shift;
		val \|= (u32)value << divider->shift;
		clk_writel(val, divider->reg);

		if (divider->lock)