From d9e4c4ee12e490aca06a0a70d534c60648e2f43a Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Mon, 13 Jun 2016 15:08:01 +0530 Subject: [PATCH] greybus: camera: Initialize mutex before using it We are using the mutex from gb_camera_cleanup(), which can get called even before the mutex is initialized. Fix it by initializing the mutex early enough. Signed-off-by: Viresh Kumar Reviewed-by: Laurent Pinchart Reviewed-by: Vaibhav Hiremath Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/camera.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c index ca1f4989197f..0d20c6b8b015 100644 --- a/drivers/staging/greybus/camera.c +++ b/drivers/staging/greybus/camera.c @@ -999,6 +999,7 @@ static int gb_camera_probe(struct gb_bundle *bundle, return -ENOMEM; gcam->bundle = bundle; + mutex_init(&gcam->mutex); conn = gb_connection_create(bundle, mgmt_cport_id, gb_camera_request_handler); @@ -1014,8 +1015,6 @@ static int gb_camera_probe(struct gb_bundle *bundle, if (ret) goto error; - mutex_init(&gcam->mutex); - /* * Create the data connection between the camera module data CPort and * APB CDSI1. The CDSI1 CPort ID is hardcoded by the ES2 bridge. -- 2.39.5