1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index b84a295230fc..2c27f6f5a668 100644
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -381,6 +381,7 @@ EXPORT_SYMBOL(drm_primary_helper_update);
 /**
  * drm_primary_helper_disable() - Helper for primary plane disable
  * @plane: plane to disable
+ * @ctx: lock acquire context, not used here
  *
  * Provides a default plane disable handler for primary planes.  This is handler
  * is called in response to a userspace SetPlane operation on the plane with a
@@ -510,12 +511,10 @@ int drm_plane_helper_commit(struct drm_plane *plane,
         if (plane_funcs->cleanup_fb)
                 plane_funcs->cleanup_fb(plane, plane_state);
 out:
-        if (plane_state) {
-                if (plane->funcs->atomic_destroy_state)
-                        plane->funcs->atomic_destroy_state(plane, plane_state);
-                else
-                        drm_atomic_helper_plane_destroy_state(plane, plane_state);
-        }
+        if (plane->funcs->atomic_destroy_state)
+                plane->funcs->atomic_destroy_state(plane, plane_state);
+        else
+                drm_atomic_helper_plane_destroy_state(plane, plane_state);
 
         return ret;
 }