2 files changed, 10 insertions, 14 deletions

diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index 0da9862ad8ed..70e9fd59c5a2 100644
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -142,9 +142,9 @@ static int sun4i_drv_bind(struct device *dev)
 
         /* Create our layers */
         drv->layers = sun4i_layers_init(drm);
-        if (!drv->layers) {
+        if (IS_ERR(drv->layers)) {
                 dev_err(drm->dev, "Couldn't create the planes\n");
-                ret = -EINVAL;
+                ret = PTR_ERR(drv->layers);
                 goto free_drm;
         }
 
diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
index c3ff10f559cc..d198ad7e5323 100644
--- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
+++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
@@ -152,15 +152,13 @@ static void sun4i_rgb_encoder_enable(struct drm_encoder *encoder)
 
         DRM_DEBUG_DRIVER("Enabling RGB output\n");
 
-        if (!IS_ERR(tcon->panel)) {
+        if (!IS_ERR(tcon->panel))
                 drm_panel_prepare(tcon->panel);
-                drm_panel_enable(tcon->panel);
-        }
-
-        /* encoder->bridge can be NULL; drm_bridge_enable checks for it */
-        drm_bridge_enable(encoder->bridge);
 
         sun4i_tcon_channel_enable(tcon, 0);
+
+        if (!IS_ERR(tcon->panel))
+                drm_panel_enable(tcon->panel);
 }
 
 static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder)
@@ -171,15 +169,13 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder)
 
         DRM_DEBUG_DRIVER("Disabling RGB output\n");
 
-        sun4i_tcon_channel_disable(tcon, 0);
+        if (!IS_ERR(tcon->panel))
+                drm_panel_disable(tcon->panel);
 
-        /* encoder->bridge can be NULL; drm_bridge_disable checks for it */
-        drm_bridge_disable(encoder->bridge);
+        sun4i_tcon_channel_disable(tcon, 0);
 
-        if (!IS_ERR(tcon->panel)) {
-                drm_panel_disable(tcon->panel);
+        if (!IS_ERR(tcon->panel))
                 drm_panel_unprepare(tcon->panel);
-        }
 }
 
 static void sun4i_rgb_encoder_mode_set(struct drm_encoder *encoder,