summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBernard Zhao <bernard@vivo.com>2020-04-28 06:17:47 -0700
committerNeil Armstrong <narmstrong@baylibre.com>2020-05-13 12:00:37 +0200
commitc54a8f1f329197d83d941ad84c4aa38bf282cbbd (patch)
treec36e0867864d1b91c87a138291f8e8988641dfad /drivers
parent5fe89a6acd668cbd1817fcdef5caa9fee568c2e8 (diff)
downloadlinux-sh-c54a8f1f329197d83d941ad84c4aa38bf282cbbd.tar.gz
drm/meson: pm resume add return errno branch
pm_resump api did not handle drm_mode_config_helper_resume error. This change add handle to return drm_mode_config_helper_resume`s error number. This code logic is aligned with api pm_suspend. After this change, the code maybe a bit readable. Signed-off-by: Bernard Zhao <bernard@vivo.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200428131747.2099-1-bernard@vivo.com
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)