diff options
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/sr_device.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 68ff8d51973c..79d4820b291b 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -461,7 +461,7 @@ static void __init beagle_opp_init(void) | |||
461 | mpu_dev = omap_device_get_by_hwmod_name("mpu"); | 461 | mpu_dev = omap_device_get_by_hwmod_name("mpu"); |
462 | iva_dev = omap_device_get_by_hwmod_name("iva"); | 462 | iva_dev = omap_device_get_by_hwmod_name("iva"); |
463 | 463 | ||
464 | if (!mpu_dev || !iva_dev) { | 464 | if (IS_ERR(mpu_dev) || IS_ERR(iva_dev)) { |
465 | pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n", | 465 | pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n", |
466 | __func__, mpu_dev, iva_dev); | 466 | __func__, mpu_dev, iva_dev); |
467 | return; | 467 | return; |
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index abefbc4d8e0b..1e40afe7ed3c 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
@@ -177,7 +177,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, | |||
177 | } | 177 | } |
178 | 178 | ||
179 | voltdm = voltdm_lookup(vdd_name); | 179 | voltdm = voltdm_lookup(vdd_name); |
180 | if (IS_ERR(voltdm)) { | 180 | if (!voltdm) { |
181 | pr_err("%s: unable to get vdd pointer for vdd_%s\n", | 181 | pr_err("%s: unable to get vdd pointer for vdd_%s\n", |
182 | __func__, vdd_name); | 182 | __func__, vdd_name); |
183 | goto exit; | 183 | goto exit; |
diff --git a/arch/arm/mach-omap2/sr_device.c b/arch/arm/mach-omap2/sr_device.c index cbeae56b56a9..f8217a5a4a26 100644 --- a/arch/arm/mach-omap2/sr_device.c +++ b/arch/arm/mach-omap2/sr_device.c | |||
@@ -122,7 +122,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) | |||
122 | sr_data->senp_mod = 0x1; | 122 | sr_data->senp_mod = 0x1; |
123 | 123 | ||
124 | sr_data->voltdm = voltdm_lookup(sr_dev_attr->sensor_voltdm_name); | 124 | sr_data->voltdm = voltdm_lookup(sr_dev_attr->sensor_voltdm_name); |
125 | if (IS_ERR(sr_data->voltdm)) { | 125 | if (!sr_data->voltdm) { |
126 | pr_err("%s: Unable to get voltage domain pointer for VDD %s\n", | 126 | pr_err("%s: Unable to get voltage domain pointer for VDD %s\n", |
127 | __func__, sr_dev_attr->sensor_voltdm_name); | 127 | __func__, sr_dev_attr->sensor_voltdm_name); |
128 | goto exit; | 128 | goto exit; |