| Message ID | CAPgLHd9aJUYX_a7_iXLi5r6VEVuB0W15G9Ryw2bVzNzko2NpBA@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Wei Yongjun <weiyj.lk@gmail.com> writes: > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > 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> Acked-by: Kevin Hilman <khilman@ti.com> > --- > arch/arm/mach-omap2/board-omap3beagle.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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; > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Wei Yongjun <weiyj.lk@gmail.com> writes: > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > 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> Thanks, queueing this up for v3.7-rc. Kevin > --- > arch/arm/mach-omap2/board-omap3beagle.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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; > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;