p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
This commit is contained in:
Wei Yongjun 2014-08-26 12:23:07 +02:00 committed by Benjamin Gaignard
parent 31f32a21aa
commit 88cfc3fb77
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/sti/sti_hdmi.c
View File

@ -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;
}