diff options
author | Chris Zankel <chris@zankel.net> | 2014-11-10 00:05:43 -0800 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2014-11-10 00:05:43 -0800 |
commit | aeb589734251aaf4c28d80d0efb5da01dc0ce868 (patch) | |
tree | ea1ee0a54d4c24221a1e80cd07e899f8b34a6920 /arch/mips/loongson/lemote-2f/clock.c | |
parent | 66acb0216d5ae1f29fe76c5a192547664c5c0159 (diff) | |
parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) |
Merge tag 'v3.18-rc4' into for_next
Linux 3.18-rc4
Diffstat (limited to 'arch/mips/loongson/lemote-2f/clock.c')
-rw-r--r-- | arch/mips/loongson/lemote-2f/clock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/loongson/lemote-2f/clock.c b/arch/mips/loongson/lemote-2f/clock.c index a217061beee3..462e34d46b4a 100644 --- a/arch/mips/loongson/lemote-2f/clock.c +++ b/arch/mips/loongson/lemote-2f/clock.c @@ -91,6 +91,7 @@ EXPORT_SYMBOL(clk_put); int clk_set_rate(struct clk *clk, unsigned long rate) { + unsigned int rate_khz = rate / 1000; struct cpufreq_frequency_table *pos; int ret = 0; int regval; @@ -107,9 +108,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate) propagate_rate(clk); cpufreq_for_each_valid_entry(pos, loongson2_clockmod_table) - if (rate == pos->frequency) + if (rate_khz == pos->frequency) break; - if (rate != pos->frequency) + if (rate_khz != pos->frequency) return -ENOTSUPP; clk->rate = rate; |