From 05a276edce6500c7753c62b27076e00b03ce019c Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Fri, 22 Feb 2013 04:39:30 +0000 Subject: [PATCH] --- yaml --- r: 358450 b: refs/heads/master c: 3a3656d4011625cf98f8cc351968fe30af3cc9ac h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/imx6q-cpufreq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f3be57a0409c..92a19cf0fd0d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6561bb206aae9de8eee4516549339ee96386b87 +refs/heads/master: 3a3656d4011625cf98f8cc351968fe30af3cc9ac diff --git a/trunk/drivers/cpufreq/imx6q-cpufreq.c b/trunk/drivers/cpufreq/imx6q-cpufreq.c index d6b6ef350cb6..54e336de373b 100644 --- a/trunk/drivers/cpufreq/imx6q-cpufreq.c +++ b/trunk/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;