[PATCH] ARM: OMAP: omap_device: fix return value check in omap_device_build_ss()

Kevin Hilman khilman at deeprootsystems.com
Mon Oct 1 19:01:11 EDT 2012


Wei Yongjun <weiyj.lk at gmail.com> writes:

> From: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
>
> In case of error, the function omap_device_alloc() returns ERR_PTR()
> and never returns 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 at trendmicro.com.cn>

Acked-by: Kevin Hilman <khilman at ti.com>


> ---
>  arch/arm/plat-omap/omap_device.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
> index c490240..3f62de6 100644
> --- a/arch/arm/plat-omap/omap_device.c
> +++ b/arch/arm/plat-omap/omap_device.c
> @@ -671,7 +671,7 @@ struct platform_device __init *omap_device_build_ss(const char *pdev_name, int p
>  		dev_set_name(&pdev->dev, "%s", pdev->name);
>  
>  	od = omap_device_alloc(pdev, ohs, oh_cnt, pm_lats, pm_lats_cnt);
> -	if (!od)
> +	if (IS_ERR(od))
>  		goto odbs_exit1;
>  
>  	ret = platform_device_add_data(pdev, pdata, pdata_len);
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



More information about the linux-arm-kernel mailing list