aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-12-09 21:27:19 -0500
committerDave Airlie <airlied@redhat.com>2013-12-17 20:10:48 -0500
commit5ec467a80301fccb21eaf4bcc04cd0f4536a30d6 (patch)
tree7eae98e65ecf29b3988f7a4ad578ba97e8aa4dd6
parent6b27f7f0e97b2819f5e272ffc2dda24881caebd6 (diff)
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.c13
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,
144 sprintf(name, "lvds.%u", lvds->index); 144 sprintf(name, "lvds.%u", lvds->index);
145 145
146 mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, name); 146 mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
147 if (mem == NULL) {
148 dev_err(&pdev->dev, "failed to get memory resource for %s\n",
149 name);
150 return -EINVAL;
151 }
152
153 lvds->mmio = devm_ioremap_resource(&pdev->dev, mem); 147 lvds->mmio = devm_ioremap_resource(&pdev->dev, mem);
154 if (lvds->mmio == NULL) { 148 if (IS_ERR(lvds->mmio))
155 dev_err(&pdev->dev, "failed to remap memory resource for %s\n", 149 return PTR_ERR(lvds->mmio);
156 name);
157 return -ENOMEM;
158 }
159 150
160 lvds->clock = devm_clk_get(&pdev->dev, name); 151 lvds->clock = devm_clk_get(&pdev->dev, name);
161 if (IS_ERR(lvds->clock)) { 152 if (IS_ERR(lvds->clock)) {