From 957ccca08a990888e2a8f057dee646b8f37b1660 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Wed, 29 Jun 2016 13:42:26 -0700 Subject: [PATCH] greybus: light: Initialize mutex before using it Light protocol driver is suffering from the same issue that was fixed in camera driver earlier (commit a7c3b0c3c8da). Big cleanup function is used instead of fine grained control in the error path, and in one of the cases the mutex was found uninitialized and so the oops seen in SW-6752. Initialize the mutex before any code can access it. Compile tested only. Signed-off-by: Viresh Kumar Reviewed-by: Rui Miguel Silva Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/light.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index 78fb8a9f6a48..3d42a5dafee9 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -1221,6 +1221,8 @@ static int gb_lights_probe(struct gb_bundle *bundle, if (!glights) return -ENOMEM; + mutex_init(&glights->lights_lock); + connection = gb_connection_create(bundle, le16_to_cpu(cport_desc->id), gb_lights_request_handler); if (IS_ERR(connection)) { @@ -1231,8 +1233,6 @@ static int gb_lights_probe(struct gb_bundle *bundle, glights->connection = connection; gb_connection_set_data(connection, glights); - mutex_init(&glights->lights_lock); - greybus_set_drvdata(bundle, glights); /* We aren't ready to receive an incoming request yet */ -- 2.39.5