Browse Source

media: smiapp: Use __v4l2_ctrl_handler_setup()

Use unlocked __v4l2_ctrl_handler_setup() in order to make the
control setup atomic.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Sakari Ailus 8 years ago
parent
commit
72eaf99f04
1 changed files with 12 additions and 8 deletions
  1. 12 8
      drivers/media/i2c/smiapp/smiapp-core.c

+ 12 - 8
drivers/media/i2c/smiapp/smiapp-core.c

@@ -1325,24 +1325,28 @@ static int smiapp_power_on(struct device *dev)
 	if (!sensor->pixel_array)
 		return 0;
 
-	rval = v4l2_ctrl_handler_setup(&sensor->pixel_array->ctrl_handler);
+	mutex_lock(&sensor->mutex);
+
+	rval = __v4l2_ctrl_handler_setup(&sensor->pixel_array->ctrl_handler);
 	if (rval)
-		goto out_cci_addr_fail;
+		goto out_unlock;
 
-	rval = v4l2_ctrl_handler_setup(&sensor->src->ctrl_handler);
+	rval = __v4l2_ctrl_handler_setup(&sensor->src->ctrl_handler);
 	if (rval)
-		goto out_cci_addr_fail;
+		goto out_unlock;
 
-	mutex_lock(&sensor->mutex);
 	rval = smiapp_update_mode(sensor);
-	mutex_unlock(&sensor->mutex);
 	if (rval < 0)
-		goto out_cci_addr_fail;
+		goto out_unlock;
+
+	mutex_unlock(&sensor->mutex);
 
 	return 0;
 
-out_cci_addr_fail:
+out_unlock:
+	mutex_unlock(&sensor->mutex);
 
+out_cci_addr_fail:
 	gpiod_set_value(sensor->xshutdown, 0);
 	clk_disable_unprepare(sensor->ext_clk);