Commit 1d2a1eb1 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-misc-fixes-2020-05-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

Just one meson patch this time to propagate an error code
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200514073538.wvdtv5s2mt4wdrdj@gilmour.lan
parents 27db6f7b c54a8f1f
...@@ -412,9 +412,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev) ...@@ -412,9 +412,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev)
if (priv->afbcd.ops) if (priv->afbcd.ops)
priv->afbcd.ops->init(priv); priv->afbcd.ops->init(priv);
drm_mode_config_helper_resume(priv->drm); return drm_mode_config_helper_resume(priv->drm);
return 0;
} }
static int compare_of(struct device *dev, void *data) static int compare_of(struct device *dev, void *data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment