diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-06-15 23:58:27 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-06-15 23:58:27 -0400 |
| commit | 925344ccc91d7a7fd84cab2dece1c34bbd86fd8c (patch) | |
| tree | bd4110dc5a3b70a5674b9d6d5340cc1889f5d6e8 /drivers/gpu/drm/imx | |
| parent | a6821698918a579e7219d706092e83f367f01ba2 (diff) | |
| parent | 32c1431eea4881a6b17bd7c639315010aeefa452 (diff) | |
BackMerge tag 'v4.12-rc5' into drm-next
Linux 4.12-rc5 for nouveau fixes
Diffstat (limited to 'drivers/gpu/drm/imx')
| -rw-r--r-- | drivers/gpu/drm/imx/imx-ldb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index 8fb801fab039..8b05ecb8fdef 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c | |||
| @@ -673,7 +673,7 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data) | |||
| 673 | ret = drm_of_find_panel_or_bridge(child, | 673 | ret = drm_of_find_panel_or_bridge(child, |
| 674 | imx_ldb->lvds_mux ? 4 : 2, 0, | 674 | imx_ldb->lvds_mux ? 4 : 2, 0, |
| 675 | &channel->panel, &channel->bridge); | 675 | &channel->panel, &channel->bridge); |
| 676 | if (ret) | 676 | if (ret && ret != -ENODEV) |
| 677 | return ret; | 677 | return ret; |
| 678 | 678 | ||
| 679 | /* panel ddc only if there is no bridge */ | 679 | /* panel ddc only if there is no bridge */ |