Merge branch 'asoc-4.17' into asoc-4.18 for compress dependencies

[linux-2.6-microblaze.git] / drivers / clk / versatile / clk-vexpress-osc.c

diff --git a/drivers/clk/versatile/clk-vexpress-osc.c b/drivers/clk/versatile/clk-vexpress-osc.c
index e7a868b..dd08ecb 100644 (file)
--- a/drivers/clk/versatile/clk-vexpress-osc.c
+++ b/drivers/clk/versatile/clk-vexpress-osc.c
@@ -44,10 +44,10 @@ static long vexpress_osc_round_rate(struct clk_hw *hw, unsigned long rate,
 {
        struct vexpress_osc *osc = to_vexpress_osc(hw);
 
-       if (WARN_ON(osc->rate_min && rate < osc->rate_min))
+       if (osc->rate_min && rate < osc->rate_min)
                rate = osc->rate_min;
 
-       if (WARN_ON(osc->rate_max && rate > osc->rate_max))
+       if (osc->rate_max && rate > osc->rate_max)
                rate = osc->rate_max;
 
        return rate;
@@ -104,6 +104,7 @@ static int vexpress_osc_probe(struct platform_device *pdev)
                return PTR_ERR(clk);
 
        of_clk_add_provider(pdev->dev.of_node, of_clk_src_simple_get, clk);
+       clk_hw_set_rate_range(&osc->hw, osc->rate_min, osc->rate_max);
 
        dev_dbg(&pdev->dev, "Registered clock '%s'\n", init.name);