diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2014-08-26 12:23:07 +0200 |
|---|---|---|
| committer | Benjamin Gaignard <benjamin.gaignard@linaro.org> | 2014-08-26 14:16:39 +0200 |
| commit | 88cfc3fb77d2a280f935dc482bdd781b96ff5570 (patch) | |
| tree | 8704cc0a757cc98a6fdb746736adddbc7047101d /drivers/gpu | |
| parent | 31f32a21aa7e31179406f82b5fb3195b83d7acc8 (diff) | |
| download | linux-stable-88cfc3fb77d2a280f935dc482bdd781b96ff5570.tar.gz linux-stable-88cfc3fb77d2a280f935dc482bdd781b96ff5570.tar.bz2 linux-stable-88cfc3fb77d2a280f935dc482bdd781b96ff5570.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/sti/sti_hdmi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index 284e541d970d..8319f764c18e 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -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; } |