diff options
| author | Wei Yongjun | 2014-08-26 12:23:52 +0200 |
|---|---|---|
| committer | Benjamin Gaignard | 2014-08-26 14:16:46 +0200 |
| commit | 5024a2b7ae9a92b8ec97ac1507efb283778480ce (patch) | |
| tree | f48b395cbe30973e5790575f567681692bd2a02b /drivers/gpu/drm | |
| parent | drm: sti: hdmi: fix return value check in sti_hdmi_probe() (diff) | |
| download | kernel-qcow2-linux-5024a2b7ae9a92b8ec97ac1507efb283778480ce.tar.gz kernel-qcow2-linux-5024a2b7ae9a92b8ec97ac1507efb283778480ce.tar.xz kernel-qcow2-linux-5024a2b7ae9a92b8ec97ac1507efb283778480ce.zip | |
drm: sti: hda: fix return value check in sti_hda_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/drm')
| -rw-r--r-- | drivers/gpu/drm/sti/sti_hda.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c index 72d957f81c05..2802b81cc9a2 100644 --- a/drivers/gpu/drm/sti/sti_hda.c +++ b/drivers/gpu/drm/sti/sti_hda.c @@ -730,16 +730,16 @@ static int sti_hda_probe(struct platform_device *pdev) return -ENOMEM; } hda->regs = devm_ioremap_nocache(dev, res->start, resource_size(res)); - if (IS_ERR(hda->regs)) - return PTR_ERR(hda->regs); + if (!hda->regs) + return -ENOMEM; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "video-dacs-ctrl"); if (res) { hda->video_dacs_ctrl = devm_ioremap_nocache(dev, res->start, resource_size(res)); - if (IS_ERR(hda->video_dacs_ctrl)) - return PTR_ERR(hda->video_dacs_ctrl); + if (!hda->video_dacs_ctrl) + return -ENOMEM; } else { /* If no existing video-dacs-ctrl resource continue the probe */ DRM_DEBUG_DRIVER("No video-dacs-ctrl resource\n"); |