diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-09 11:23:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-09 11:23:57 +0100 |
| commit | 95a9ca74768089d89c17ba958d6f009aa9c18525 (patch) | |
| tree | 513200c0d5255eb1918f64fc11417858b1539ebb /drivers/gpu/drm/imx/parallel-display.c | |
| parent | 4e2576bd36a12e78ac3786d05b99a820dffe687f (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
Merge tag 'v4.0-rc7' into asoc-core
Linux 4.0-rc7
Diffstat (limited to 'drivers/gpu/drm/imx/parallel-display.c')
| -rw-r--r-- | drivers/gpu/drm/imx/parallel-display.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c index 5e83e007080f..900dda6a8e71 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c @@ -236,8 +236,11 @@ static int imx_pd_bind(struct device *dev, struct device *master, void *data) } panel_node = of_parse_phandle(np, "fsl,panel", 0); - if (panel_node) + if (panel_node) { imxpd->panel = of_drm_find_panel(panel_node); + if (!imxpd->panel) + return -EPROBE_DEFER; + } imxpd->dev = dev; |