]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/vkms: Drop unnecessary call to drm_crtc_cleanup()
authorJosé Expósito <jose.exposito89@gmail.com>
Thu, 31 Oct 2024 18:38:35 +0000 (19:38 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 12:53:19 +0000 (13:53 +0100)
[ Upstream commit 1d43dddd7c38ea1aa93f78f7ee10087afb0a561f ]

CRTC creation uses drmm_crtc_init_with_planes(), which automatically
handles cleanup. However, an unnecessary call to drm_crtc_cleanup() is
still present in the vkms_output_init() error path.

Fixes: 99cc528ebe92 ("drm/vkms: Use drmm_crtc_init_with_planes()")
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Reviewed-by: Maíra Canal <mcanal@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241031183835.3633-1-jose.exposito89@gmail.com
Acked-by: Louis Chauvet <louis.chauvet@bootlin.com>
Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/vkms/vkms_output.c

index 5ce70dd946aa631d156589202d10d779018844ff..24589b947dea3de590e829aec260b2a3d3a20bff 100644 (file)
@@ -84,7 +84,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index)
                                 DRM_MODE_CONNECTOR_VIRTUAL);
        if (ret) {
                DRM_ERROR("Failed to init connector\n");
-               goto err_connector;
+               return ret;
        }
 
        drm_connector_helper_add(connector, &vkms_conn_helper_funcs);
@@ -119,8 +119,5 @@ err_attach:
 err_encoder:
        drm_connector_cleanup(connector);
 
-err_connector:
-       drm_crtc_cleanup(crtc);
-
        return ret;
 }