From 2e710e51bbd317ccf38fc7bca8ffeda3d025dc34 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Thu, 8 Jan 2015 15:40:29 +0100 Subject: [PATCH] Fix mutex hang in colord on output removal Using the x11 output (maybe with others as well), weston would hang when closing the output if the colord plugin is enabled. The hang occurs in mutex lock in the output notifier handler because the given GMutex value is incorrect. This is because of a cast error, the type of container should be "cms_output" and not "cms_colord". Signed-off-by: Olivier Fourdan Reviewed-by: Richard Hughes Reviewed-by: Bryce Harrington --- src/cms-colord.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/cms-colord.c b/src/cms-colord.c index c541a34..a6b105c 100644 --- a/src/cms-colord.c +++ b/src/cms-colord.c @@ -212,10 +212,11 @@ colord_device_changed_cb(CdDevice *device, struct cms_output *ocms) static void colord_notifier_output_destroy(struct wl_listener *listener, void *data) { - struct cms_colord *cms = - container_of(listener, struct cms_colord, destroy_listener); + struct cms_output *ocms = + container_of(listener, struct cms_output, destroy_listener); struct weston_output *o = (struct weston_output *) data; - struct cms_output *ocms; + struct cms_colord *cms = ocms->cms; + gboolean ret; gchar *device_id; GError *error = NULL; @@ -223,11 +224,6 @@ colord_notifier_output_destroy(struct wl_listener *listener, void *data) colord_idle_cancel_for_output(cms, o); device_id = get_output_id(cms, o); weston_log("colord: output removed %s\n", device_id); - ocms = g_hash_table_lookup(cms->devices, device_id); - if (!ocms) { - weston_log("colord: failed to delete device\n"); - goto out; - } g_signal_handlers_disconnect_by_data(ocms->device, ocms); ret = cd_client_delete_device_sync (cms->client, ocms->device, -- 2.7.4