diff options
| author |   Dave Airlie <airlied@redhat.com> | 2017-12-01 09:14:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-12-01 09:14:18 +1000 |
| commit | a42ea78f5b73d8aba9665ad34fb88e483f442f6f (patch) | |
| tree | 49be4dcce8f9ff879a45808cd9140dedab1b9127 /drivers/gpu/drm/arm/hdlcd_crtc.c | |
| parent | Merge tag 'imx-drm-fixes-2017-11-30' of git://git.pengutronix.de/git/pza/linux into drm-fixes (diff) | |
| parent | drm/arm: Replace instances of drm_dev_unref with drm_dev_put. (diff) | |
| download | wireguard-linux-a42ea78f5b73d8aba9665ad34fb88e483f442f6f.tar.xz wireguard-linux-a42ea78f5b73d8aba9665ad34fb88e483f442f6f.zip | |
Merge branch 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld into drm-fixes
3 hdlcd fixes/cleanups
* 'for-upstream/hdlcd' of git://linux-arm.org/linux-ld:
drm/arm: Replace instances of drm_dev_unref with drm_dev_put.
drm: Fix checkpatch issue: "WARNING: braces {} are not necessary for single statement blocks."
drm: hdlcd: Update PM code to save/restore console.
Diffstat (limited to 'drivers/gpu/drm/arm/hdlcd_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/arm/hdlcd_crtc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c index 72b22b805412..5a5427bbd70e 100644 --- a/drivers/gpu/drm/arm/hdlcd_crtc.c +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c @@ -317,9 +317,8 @@ static struct drm_plane *hdlcd_plane_init(struct drm_device *drm) formats, ARRAY_SIZE(formats), NULL, DRM_PLANE_TYPE_PRIMARY, NULL); - if (ret) { + if (ret) return ERR_PTR(ret); - } drm_plane_helper_add(plane, &hdlcd_plane_helper_funcs); hdlcd->plane = plane; |