]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm/nouveau: Remove bogus cleanup in nv50_mstm_add_connector()
authorLyude Paul <lyude@redhat.com>
Fri, 11 Jan 2019 00:53:35 +0000 (19:53 -0500)
committerLyude Paul <lyude@redhat.com>
Fri, 11 Jan 2019 01:38:07 +0000 (20:38 -0500)
Trying to destroy the connector using mstc->connector.funcs->destroy()
if connector initialization fails is wrong: there is no possible
codepath in nv50_mstc_new where nv50_mstm_add_connector() would return
<0 and mstc would be non-NULL.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: David Airlie <airlied@redhat.com>
Cc: Jerry Zuo <Jerry.Zuo@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Juston Li <juston.li@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190111005343.17443-13-lyude@redhat.com
drivers/gpu/drm/nouveau/dispnv50/disp.c

index f36146d4d9b7fe506836dee2a5182ab29f011990..d173cdd6ee3fb7ee636daa332577b4973e0b74df 100644 (file)
@@ -1091,11 +1091,8 @@ nv50_mstm_add_connector(struct drm_dp_mst_topology_mgr *mgr,
        int ret;
 
        ret = nv50_mstc_new(mstm, port, path, &mstc);
-       if (ret) {
-               if (mstc)
-                       mstc->connector.funcs->destroy(&mstc->connector);
+       if (ret)
                return NULL;
-       }
 
        return &mstc->connector;
 }