Merge branch 'pm-cpufreq'

* pm-cpufreq: cpufreq: OMAP: Check IS_ERR() instead of NULL for omap_device_get_by_hwmod_name
git-mirror · Sep 24, 2012 · 59f3b79 · 59f3b79
2 parents fa373ab + 1bae995
commit 59f3b79
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
@@ -266,9 +266,9 @@ static int __init omap_cpufreq_init(void)
 	}
 
 	mpu_dev = omap_device_get_by_hwmod_name("mpu");
-	if (!mpu_dev) {
+	if (IS_ERR(mpu_dev)) {
 		pr_warning("%s: unable to get the mpu device\n", __func__);
-		return -EINVAL;
+		return PTR_ERR(mpu_dev);
 	}
 
 	mpu_reg = regulator_get(mpu_dev, "vcc");