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

airlied · airlied · commit 1d2a1eb13610 · 2020-05-15T16:00:57.000+10:00
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
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -412,9 +412,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev)`
`412`	`412`	`if (priv->afbcd.ops)`
`413`	`413`	`priv->afbcd.ops->init(priv);`
`414`	`414`
`415`		`- drm_mode_config_helper_resume(priv->drm);`
`416`		`-`
`417`		`- return 0;`
	`415`	`+ return drm_mode_config_helper_resume(priv->drm);`
`418`	`416`	`}`
`419`	`417`
`420`	`418`	`static int compare_of(struct device dev, void data)`