diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-01-25 11:42:25 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-01-25 11:42:25 +1000 |
| commit | 559f17bec508548850654dd04525fd69d90f6d4e (patch) | |
| tree | f6d60cbcd42a481779ff1f13d831b9f105a22769 /drivers/gpu/drm/sun4i | |
| parent | 22bc72c8075fa350482cdbbd66597d626aa506c8 (diff) | |
| parent | 341a0ffceaa44660c43d219a3b2569ebbd7d3ad1 (diff) | |
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()
Diffstat (limited to 'drivers/gpu/drm/sun4i')
| -rw-r--r-- | drivers/gpu/drm/sun4i/sun4i_tcon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c index b78fed809992..3c15cf24b503 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c @@ -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; |