diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-22 23:41:53 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-22 23:41:53 (GMT) |
| commit | d3caf89433755279caa0196c093a87fc5e63bd36 (patch) | |
| tree | 6dec650306ce51dcdc28eb55c188f630d774d6a2 /drivers/cpufreq | |
| parent | 6ecf96806beaa00cc0f50555cca0106a39c121eb (diff) | |
| parent | 3a3656d4011625cf98f8cc351968fe30af3cc9ac (diff) | |
| download | linux-d3caf89433755279caa0196c093a87fc5e63bd36.tar.xz | |
Merge branch 'pm-cpufreq' into fixes
* pm-cpufreq:
imx6q-cpufreq: fix return value check in imx6q_cpufreq_probe()
PM / OPP: fix condition for empty of_init_opp_table()
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/imx6q-cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c index d6b6ef3..54e336d 100644 --- a/drivers/cpufreq/imx6q-cpufreq.c +++ b/drivers/cpufreq/imx6q-cpufreq.c @@ -245,7 +245,7 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) arm_reg = devm_regulator_get(cpu_dev, "arm"); pu_reg = devm_regulator_get(cpu_dev, "pu"); soc_reg = devm_regulator_get(cpu_dev, "soc"); - if (!arm_reg || !pu_reg || !soc_reg) { + if (IS_ERR(arm_reg) || IS_ERR(pu_reg) || IS_ERR(soc_reg)) { dev_err(cpu_dev, "failed to get regulators\n"); ret = -ENOENT; goto put_node; |