diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-12-10 03:27:19 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-18 11:10:48 +1000 |
| commit | 5ec467a80301fccb21eaf4bcc04cd0f4536a30d6 (patch) | |
| tree | 7eae98e65ecf29b3988f7a4ad578ba97e8aa4dd6 | |
| parent | 6b27f7f0e97b2819f5e272ffc2dda24881caebd6 (diff) | |
| download | linux-5ec467a80301fccb21eaf4bcc04cd0f4536a30d6.tar.gz linux-5ec467a80301fccb21eaf4bcc04cd0f4536a30d6.tar.bz2 linux-5ec467a80301fccb21eaf4bcc04cd0f4536a30d6.zip | |
drm/rcar-du: Fix return value check in rcar_du_lvdsenc_get_resources()
In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should be
replaced with IS_ERR(). Also remove the dev_err call to avoid redundant
error message.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
[Remove the unneeded mem == NULL check]
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c index a0f6a1781925..fe1f6f59f539 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c @@ -144,18 +144,9 @@ static int rcar_du_lvdsenc_get_resources(struct rcar_du_lvdsenc *lvds, sprintf(name, "lvds.%u", lvds->index); mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, name); - if (mem == NULL) { - dev_err(&pdev->dev, "failed to get memory resource for %s\n", - name); - return -EINVAL; - } - lvds->mmio = devm_ioremap_resource(&pdev->dev, mem); - if (lvds->mmio == NULL) { - dev_err(&pdev->dev, "failed to remap memory resource for %s\n", - name); - return -ENOMEM; - } + if (IS_ERR(lvds->mmio)) + return PTR_ERR(lvds->mmio); lvds->clock = devm_clk_get(&pdev->dev, name); if (IS_ERR(lvds->clock)) { |