]> Pileus Git - ~andy/linux/commitdiff
imx6q-cpufreq: fix return value check in imx6q_cpufreq_probe()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Fri, 22 Feb 2013 04:39:30 +0000 (04:39 +0000)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 22 Feb 2013 23:30:25 +0000 (00:30 +0100)
In case of error, the function devm_regulator_get() returns
ERR_PTR() and never returns NULL. The NULL test in the return
value check should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpufreq/imx6q-cpufreq.c

index d6b6ef350cb621f49323b4e8ff4c61b41a9cc69d..54e336de373bf60918fc515e12b5fd273cbf8419 100644 (file)
@@ -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;