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

Commit 88cfc3fb authored by Wei Yongjun's avatar Wei Yongjun Committed by Benjamin Gaignard
Browse files

drm: sti: hdmi: fix return value check in sti_hdmi_probe() 



In case of error, the function devm_ioremap_nocache() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
parent 31f32a21

drivers/gpu/drm/sti/sti_hdmi.c

+4 −4
Original line number Diff line number Diff line
@@ -713,8 +713,8 @@ static int sti_hdmi_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}

	hdmi->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));

	if (IS_ERR(hdmi->regs))

		return PTR_ERR(hdmi->regs);

	if (!hdmi->regs)

		return -ENOMEM;



	if (of_device_is_compatible(np, "st,stih416-hdmi")) {

		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
@@ -725,8 +725,8 @@ static int sti_hdmi_probe(struct platform_device *pdev) 
		}

		hdmi->syscfg = devm_ioremap_nocache(dev, res->start,

						    resource_size(res));

		if (IS_ERR(hdmi->syscfg))

			return PTR_ERR(hdmi->syscfg);

		if (!hdmi->syscfg)

			return -ENOMEM;



	}