diff options
| -rw-r--r-- | drivers/clk/meson/clk-pll.c | 2 | ||||
| -rw-r--r-- | drivers/clk/meson/vid-pll-div.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c index 41e16dd7272a..7a14ac9b2fec 100644 --- a/drivers/clk/meson/clk-pll.c +++ b/drivers/clk/meson/clk-pll.c | |||
| @@ -120,7 +120,7 @@ static bool meson_clk_pll_is_better(unsigned long rate, | |||
| 120 | return true; | 120 | return true; |
| 121 | } else { | 121 | } else { |
| 122 | /* Round down */ | 122 | /* Round down */ |
| 123 | if (now < rate && best < now) | 123 | if (now <= rate && best < now) |
| 124 | return true; | 124 | return true; |
| 125 | } | 125 | } |
| 126 | 126 | ||
diff --git a/drivers/clk/meson/vid-pll-div.c b/drivers/clk/meson/vid-pll-div.c index 08bcc01c0923..daff235bc763 100644 --- a/drivers/clk/meson/vid-pll-div.c +++ b/drivers/clk/meson/vid-pll-div.c | |||
| @@ -82,8 +82,8 @@ static unsigned long meson_vid_pll_div_recalc_rate(struct clk_hw *hw, | |||
| 82 | div = _get_table_val(meson_parm_read(clk->map, &pll_div->val), | 82 | div = _get_table_val(meson_parm_read(clk->map, &pll_div->val), |
| 83 | meson_parm_read(clk->map, &pll_div->sel)); | 83 | meson_parm_read(clk->map, &pll_div->sel)); |
| 84 | if (!div || !div->divider) { | 84 | if (!div || !div->divider) { |
| 85 | pr_info("%s: Invalid config value for vid_pll_div\n", __func__); | 85 | pr_debug("%s: Invalid config value for vid_pll_div\n", __func__); |
| 86 | return parent_rate; | 86 | return 0; |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | return DIV_ROUND_UP_ULL(parent_rate * div->multiplier, div->divider); | 89 | return DIV_ROUND_UP_ULL(parent_rate * div->multiplier, div->divider); |
