summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/arm
diff options
context:
space:
mode:
authorDan Carpenter2016-04-02 07:42:24 +0200
committerLiviu Dudau2016-04-04 11:11:33 +0200
commit69c2565a3cca3d79572941d62165af7805d72762 (patch)
tree500263f2efda582c9c55922fcfd661e0add769b6 /drivers/gpu/drm/arm
parentdrm: ARM HDLCD - get rid of devm_clk_put() (diff)
downloadkernel-qcow2-linux-69c2565a3cca3d79572941d62165af7805d72762.tar.gz
kernel-qcow2-linux-69c2565a3cca3d79572941d62165af7805d72762.tar.xz
kernel-qcow2-linux-69c2565a3cca3d79572941d62165af7805d72762.zip
drm: ARM HDLCD - fix an error code
We accidentally return PTR_ERR(NULL) which is success instead of a negative error code. Fixes: 879e40bea6f2 ('drm: ARM HDLCD - get rid of devm_clk_put()') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
Diffstat (limited to 'drivers/gpu/drm/arm')
-rw-r--r--drivers/gpu/drm/arm/hdlcd_drv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c
index 734849fafe28..3ac1ae4d8caf 100644
--- a/drivers/gpu/drm/arm/hdlcd_drv.c
+++ b/drivers/gpu/drm/arm/hdlcd_drv.c
@@ -55,8 +55,9 @@ static int hdlcd_load(struct drm_device *drm, unsigned long flags)
hdlcd->mmio = devm_ioremap_resource(drm->dev, res);
if (IS_ERR(hdlcd->mmio)) {
DRM_ERROR("failed to map control registers area\n");
+ ret = PTR_ERR(hdlcd->mmio);
hdlcd->mmio = NULL;
- return PTR_ERR(hdlcd->mmio);
+ return ret;
}
version = hdlcd_read(hdlcd, HDLCD_REG_VERSION);