Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a87e6628 authored by Wei Yongjun's avatar Wei Yongjun Committed by Kevin Hilman
Browse files

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

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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 104c7949

arch/arm/plat-omap/omap_device.c

+1 −1
Original line number Diff line number Diff line
@@ -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);