summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-21 14:26:37 +0800
committerKevin Hilman <khilman@ti.com>2012-10-02 14:34:08 -0700
commit104c7949e20e84dedddb66c1fc4b599931382d21 (patch)
tree0ace1d805f57eb5da51fe5b9ac0535274c302a8f /arch/arm/mach-omap2
parenta0d271cbfed1dd50278c6b06bead3d00ba0a88f9 (diff)
downloadop-kernel-dev-104c7949e20e84dedddb66c1fc4b599931382d21.zip
op-kernel-dev-104c7949e20e84dedddb66c1fc4b599931382d21.tar.gz
ARM: OMAP: fix return value check in beagle_opp_init()
In case of error, the function omap_device_get_by_hwmod_name() returns ERR_PTR() not NULL pointer. The NULL test in the return value check should be replaced with IS_ERR(). dpatch engine is used to auto generated this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/board-omap3beagle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 6202fc7..a548d70 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -466,7 +466,7 @@ static void __init beagle_opp_init(void)
mpu_dev = omap_device_get_by_hwmod_name("mpu");
iva_dev = omap_device_get_by_hwmod_name("iva");
- if (!mpu_dev || !iva_dev) {
+ if (IS_ERR(mpu_dev) || IS_ERR(iva_dev)) {
pr_err("%s: Aiee.. no mpu/dsp devices? %p %p\n",
__func__, mpu_dev, iva_dev);
return;
OpenPOWER on IntegriCloud