diff options
author | Mike Turquette <mturquette@linaro.org> | 2014-02-24 18:15:25 -0500 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-02-24 18:15:25 -0500 |
commit | 624009a7f34669233ea3376796ee674ae9416245 (patch) | |
tree | 3c09266700856e4b39d15a11995b46db30865091 /drivers/clk/tegra/clk-divider.c | |
parent | 7364001478597759fc5e00536bbe926ec9c25db0 (diff) | |
parent | c7fbd4158433c1c910c62850247728cb05a94e42 (diff) |
Merge branch 'clk-tegra-more-fixes-3.14' of git://nv-tegra.nvidia.com/user/pdeschrijver/linux into clk-fixes
Fixes stray access to undefined registers, use of wrong clock parents &
running clocks at wrong rates. All of these issues cause regressions in
the form of boards that are unable to boot or crash and die horrible
deaths.
Diffstat (limited to 'drivers/clk/tegra/clk-divider.c')
-rw-r--r-- | drivers/clk/tegra/clk-divider.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/tegra/clk-divider.c b/drivers/clk/tegra/clk-divider.c index 4d75b1f37e3a..290f9c1a3749 100644 --- a/drivers/clk/tegra/clk-divider.c +++ b/drivers/clk/tegra/clk-divider.c | |||
@@ -59,7 +59,7 @@ static int get_div(struct tegra_clk_frac_div *divider, unsigned long rate, | |||
59 | return 0; | 59 | return 0; |
60 | 60 | ||
61 | if (divider_ux1 > get_max_div(divider)) | 61 | if (divider_ux1 > get_max_div(divider)) |
62 | return -EINVAL; | 62 | return get_max_div(divider); |
63 | 63 | ||
64 | return divider_ux1; | 64 | return divider_ux1; |
65 | } | 65 | } |