提交 88cfc3fb 编写于 作者: W Wei Yongjun 提交者: Benjamin Gaignard

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: NWei Yongjun <yongjun_wei@trendmicro.com.cn>
上级 31f32a21
...@@ -713,8 +713,8 @@ static int sti_hdmi_probe(struct platform_device *pdev) ...@@ -713,8 +713,8 @@ static int sti_hdmi_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
hdmi->regs = devm_ioremap_nocache(dev, res->start, resource_size(res)); hdmi->regs = devm_ioremap_nocache(dev, res->start, resource_size(res));
if (IS_ERR(hdmi->regs)) if (!hdmi->regs)
return PTR_ERR(hdmi->regs); return -ENOMEM;
if (of_device_is_compatible(np, "st,stih416-hdmi")) { if (of_device_is_compatible(np, "st,stih416-hdmi")) {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
...@@ -725,8 +725,8 @@ static int sti_hdmi_probe(struct platform_device *pdev) ...@@ -725,8 +725,8 @@ static int sti_hdmi_probe(struct platform_device *pdev)
} }
hdmi->syscfg = devm_ioremap_nocache(dev, res->start, hdmi->syscfg = devm_ioremap_nocache(dev, res->start,
resource_size(res)); resource_size(res));
if (IS_ERR(hdmi->syscfg)) if (!hdmi->syscfg)
return PTR_ERR(hdmi->syscfg); return -ENOMEM;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册