aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/imx/parallel-display.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-07-21 00:04:44 -0400
committerDave Airlie <airlied@redhat.com>2017-07-21 00:04:44 -0400
commit5896ec77d70d33dd38a455b0aa5f3154aeecea09 (patch)
tree6fc39002d3b4d30de3dadc426fa393bfa5e82e27 /drivers/gpu/drm/imx/parallel-display.c
parent660f6b5c639228cf53b4eecda86c8dd9055bed53 (diff)
parent799ee2970485dc206c3bf347d6e6827c04d5e4f9 (diff)
Merge tag 'imx-drm-fixes-2017-07-18' of git://git.pengutronix.de/git/pza/linux into drm-fixes
imx-drm: fix parallel display regression and typo in plane format list - Fix a regression where the parallel-display driver would not probe anymore if no panel is specified in the device tree, since the introduction of drm_of_find_panel_or_bridge. - Fix a typo in the plane format list: replace a duplicate BGRA8888 format with BGRX8888, as originally intended. * tag 'imx-drm-fixes-2017-07-18' of git://git.pengutronix.de/git/pza/linux: drm/imx: parallel-display: Accept drm_of_find_panel_or_bridge failure drm/imx: fix typo in ipu_plane_formats[]
Diffstat (limited to 'drivers/gpu/drm/imx/parallel-display.c')
-rw-r--r--drivers/gpu/drm/imx/parallel-display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index 636031a30e17..8aca20209cb8 100644
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -237,7 +237,7 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data)
237 237
238 /* port@1 is the output port */ 238 /* port@1 is the output port */
239 ret = drm_of_find_panel_or_bridge(np, 1, 0, &imxpd->panel, &imxpd->bridge); 239 ret = drm_of_find_panel_or_bridge(np, 1, 0, &imxpd->panel, &imxpd->bridge);
240 if (ret) 240 if (ret && ret != -ENODEV)
241 return ret; 241 return ret;
242 242
243 imxpd->dev = dev; 243 imxpd->dev = dev;