summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-05-15 16:00:53 +1000
committerDave Airlie <airlied@redhat.com>2020-05-15 16:00:57 +1000
commit1d2a1eb13610a9c8ec95f6f1e02cef55000f28e3 (patch)
tree96dfbf2eb39419e2c69580b9c7e5306b6596d6f3 /drivers
parent27db6f7b0a79d71eb138683f808328593d8febb1 (diff)
parentc54a8f1f329197d83d941ad84c4aa38bf282cbbd (diff)
downloadlinux-sh-1d2a1eb13610a9c8ec95f6f1e02cef55000f28e3.tar.gz
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: Dave Airlie <airlied@redhat.com> From: Maxime Ripard <maxime@cerno.tech> Link: https://patchwork.freedesktop.org/patch/msgid/20200514073538.wvdtv5s2mt4wdrdj@gilmour.lan
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/meson/meson_drv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index b5f5eb7b4bb9..8c2e1b47e81a 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -412,9 +412,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev)
if (priv->afbcd.ops)
priv->afbcd.ops->init(priv);
- drm_mode_config_helper_resume(priv->drm);
-
- return 0;
+ return drm_mode_config_helper_resume(priv->drm);
}
static int compare_of(struct device *dev, void *data)