diff options
| author |   Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2015-06-08 15:25:52 +0200 |
|---|---|---|
| committer |   Benjamin Gaignard <benjamin.gaignard@linaro.org> | 2015-06-08 15:28:10 +0200 |
| commit | d3c8a0b2becf1015f502bf4b0f50fe18e0ed8a93 (patch) | |
| tree | 39e6d4e81633843007564602407dd239cac8c33b /drivers/gpu/drm/sti/sti_dvo.c | |
| parent | virtgpu: include linux/types.h to avoid warning. (diff) | |
| download | linux-dev-d3c8a0b2becf1015f502bf4b0f50fe18e0ed8a93.tar.xz linux-dev-d3c8a0b2becf1015f502bf4b0f50fe18e0ed8a93.zip | |
drm/sti: correctly test devm_ioremap() return
In case of error, the function devm_ioremap_nocache() returns NULL
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>
Diffstat (limited to 'drivers/gpu/drm/sti/sti_dvo.c')
| -rw-r--r-- | drivers/gpu/drm/sti/sti_dvo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c index a9b678af85a6..d141d645bd13 100644 --- a/drivers/gpu/drm/sti/sti_dvo.c +++ b/drivers/gpu/drm/sti/sti_dvo.c @@ -499,8 +499,8 @@ static int sti_dvo_probe(struct platform_device *pdev) } dvo->regs = devm_ioremap_nocache(dev, res->start, resource_size(res)); - if (IS_ERR(dvo->regs)) - return PTR_ERR(dvo->regs); + if (!dvo->regs) + return -ENOMEM; dvo->clk_pix = devm_clk_get(dev, "dvo_pix"); if (IS_ERR(dvo->clk_pix)) { |