ARM: OMAP3: Beagle: fix return value check in beagle_opp_init()
Subsystems (3)
PATCH 1/1 ARM: OMAP3: Beagle: fix return value check in beagle_opp_init()
From: Wei Yongjun <[email protected]>
In case of error, the function get_cpu_device() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test.
Signed-off-by Wei Yongjun <[email protected]>
--- arch/arm/mach-omap2/board-omap3beagle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/board-omap3beagle.c +1 -1
@@ -510,7 +510,7 @@ static int __init beagle_opp_init(void) mpu_dev =get_cpu_device (0 ); iva_dev =omap_device_get_by_hwmod_name ("iva" ); -if (IS_ERR (mpu_dev) ||IS_ERR (iva_dev)) { +if (!mpu_dev ||IS_ERR (iva_dev)) {pr_err ("%s: Aiee.. no mpu/dsp devices? %p %p\n" , __func__, mpu_dev, iva_dev);return -ENODEV ;
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP3: Beagle: fix return value check in beagle_opp_init()
Quoted 7 lines · Wei Yongjun
From: Wei Yongjun <[email protected]>
In case of error, the function
get_cpu_device()returns NULL pointer notERR_PTR(). TheIS_ERR()test in the return value check should be replaced with NULL test.Signed-off-by Wei Yongjun <[email protected]>
Thanks applying into omap-for-v3.13/fixes.
Tony
Quoted 18 lines
--- arch/arm/mach-omap2/board-omap3beagle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/mach-omap2/board-omap3beagle.c +1
-1@@ -510,7 +510,7 @@ static int __init beagle_opp_init(void) mpu_dev =get_cpu_device (0 ); iva_dev =omap_device_get_by_hwmod_name ("iva" ); -if (IS_ERR (mpu_dev) ||IS_ERR (iva_dev)) { +if (!mpu_dev ||IS_ERR (iva_dev)) {pr_err ("%s: Aiee.. no mpu/dsp devices? %p %p\n" , __func__, mpu_dev, iva_dev);return -ENODEV ;