projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e430309
)
MLK-11741 cpufreq: imx: fix a potential issue in the imx7 cpufreq driver
author
Bai Ping
<b51503@freescale.com>
Tue, 20 Oct 2015 16:26:21 +0000
(
00:26
+0800)
committer
Nitin Garg
<nitin.garg@nxp.com>
Mon, 19 Mar 2018 19:48:58 +0000
(14:48 -0500)
The 'OR' operation should be '||', so fix it.
Signed-off-by: Bai Ping <b51503@freescale.com>
drivers/cpufreq/imx7-cpufreq.c
patch
|
blob
|
history
diff --git
a/drivers/cpufreq/imx7-cpufreq.c
b/drivers/cpufreq/imx7-cpufreq.c
index
670d37c
..
3acd83b
100644
(file)
--- a/
drivers/cpufreq/imx7-cpufreq.c
+++ b/
drivers/cpufreq/imx7-cpufreq.c
@@
-180,7
+180,7
@@
static int imx7d_cpufreq_probe(struct platform_device *pdev)
pll_arm = devm_clk_get(cpu_dev, "pll_arm");
pll_sys_main = devm_clk_get(cpu_dev, "pll_sys_main");
- if (IS_ERR(arm_clk) |
IS_ERR(arm_src) | IS_ERR(pll_arm)
|
+ if (IS_ERR(arm_clk) |
| IS_ERR(arm_src) || IS_ERR(pll_arm) |
|
IS_ERR(pll_sys_main)) {
dev_err(cpu_dev, "failed to get clocks\n");
ret = -ENOENT;