Merge tag 'drm-misc-next-fixes-2018-01-18' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Fixes for 4.16:

Fixes one Kconfig issue and a enable some panels to work properly.
There is also a fix of error code return in sun4i.

* tag 'drm-misc-next-fixes-2018-01-18' of git://anongit.freedesktop.org/drm/drm-misc:
  drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig
  drm/panel: lvds: Handle the optional regulator case properly
  drm/sun4i: Fix error code in sun4i_tcon_bind()
This commit is contained in:
Dave Airlie
2018-01-25 11:42:25 +10:00
3 changed files with 14 additions and 7 deletions

View File

@@ -902,7 +902,7 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
has_lvds_alt = false;
} else {
dev_err(dev, "Couldn't get the LVDS PLL\n");
return PTR_ERR(tcon->lvds_rst);
return PTR_ERR(tcon->lvds_pll);
}
} else {
has_lvds_alt = true;