]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
drm: Destroy the correct mutex name in drm_dp_mst_topology_mgr_destroy
authorMatt Roper <matthew.d.roper@intel.com>
Wed, 25 Sep 2019 22:46:17 +0000 (15:46 -0700)
committerLyude Paul <lyude@redhat.com>
Wed, 25 Sep 2019 23:28:59 +0000 (19:28 -0400)
It looks like one of the topology manager mutexes may have been renamed
during a rebase, but the destruction function wasn't updated with the
new name:

   error: ‘struct drm_dp_mst_topology_mgr’ has no member named
   ‘delayed_destroy_lock’

Fixes: 50094b5dcd32 ("drm/dp_mst: Destroy topology_mgr mutexes")
Cc: Lyude Paul <lyude@redhat.com>
Cc: Sean Paul <sean@poorly.run>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190925224617.24027-1-matthew.d.roper@intel.com
drivers/gpu/drm/drm_dp_mst_topology.c

index 01d97c6cbbb2814fa0b98b7ae85e8b3422bc452c..c8804ca6264c6b8a6bc7d2d1ac947562fe0820b3 100644 (file)
@@ -4301,7 +4301,7 @@ void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr)
        drm_atomic_private_obj_fini(&mgr->base);
        mgr->funcs = NULL;
 
-       mutex_destroy(&mgr->delayed_destroy_lock);
+       mutex_destroy(&mgr->destroy_connector_lock);
        mutex_destroy(&mgr->payload_lock);
        mutex_destroy(&mgr->qlock);
        mutex_destroy(&mgr->lock);