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

Commit 64de3a00 authored by Wei Yongjun's avatar Wei Yongjun Committed by Tony Lindgren
Browse files

ARM: OMAP: hsmmc: fix return value check in omap_hsmmc_init_one() 

In case of error, the function omap_device_alloc() 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: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 9ee67723

arch/arm/mach-omap2/hsmmc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -523,7 +523,7 @@ static void __init omap_hsmmc_init_one(struct omap2_hsmmc_info *hsmmcinfo, 
	dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id);

	dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id);





	od = omap_device_alloc(pdev, ohs, 1, NULL, 0);

	od = omap_device_alloc(pdev, ohs, 1, NULL, 0);

	if (!od) {

	if (IS_ERR(od)) {

		pr_err("Could not allocate od for %s\n", name);

		pr_err("Could not allocate od for %s\n", name);

		goto put_pdev;

		goto put_pdev;

	}

	}