1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 68b402101170..6d9674160430 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -109,8 +109,9 @@ static unsigned long clk_divider_recalc_rate(struct clk_hw *hw,
        div = _get_div(divider, val);
        if (!div) {
-                WARN(1, "%s: Invalid divisor for clock %s\n", __func__,
+                WARN(!(divider->flags & CLK_DIVIDER_ALLOW_ZERO),
-                                                __clk_get_name(hw->clk));
+                        "%s: Zero divisor and CLK_DIVIDER_ALLOW_ZERO not set\n",
+                        __clk_get_name(hw->clk));
                return parent_rate;
        }

diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index 68b402101170..6d9674160430 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c
@@ -109,8 +109,9 @@ static unsigned long clk_divider_recalc_rate(struct clk_hw *hw,
109		109
110	div = _get_div(divider, val);	110	div = _get_div(divider, val);
111	if (!div) {	111	if (!div) {
112	WARN(1, "%s: Invalid divisor for clock %s\n", __func__,	112	WARN(!(divider->flags & CLK_DIVIDER_ALLOW_ZERO),
113	__clk_get_name(hw->clk));	113	"%s: Zero divisor and CLK_DIVIDER_ALLOW_ZERO not set\n",
		114	__clk_get_name(hw->clk));
114	return parent_rate;	115	return parent_rate;
115	}	116	}
116		117