Commit 59f3b797 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

* pm-cpufreq:
  cpufreq: OMAP: Check IS_ERR() instead of NULL for omap_device_get_by_hwmod_name
parents fa373abb 1bae9958

drivers/cpufreq/omap-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -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");