aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@linux.intel.com>2014-09-16 14:57:07 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-10-28 11:32:46 -0400
commitf85698cd296f08218a7750f321e94607da128600 (patch)
tree73924ccf07d5f2e5354c4a2b44c0b3b0bdfd034b /drivers/media/i2c
parentd6d41ba1cb38d3e9575462b12f22b9f0b360bc1d (diff)
[media] smiapp: Take mutex during PLL update in sensor initialisation
The mutex does not serialise anything in this case but avoids a lockdep warning from the control framework. Cc: stable@vger.kernel.org Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/smiapp/smiapp-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 932ed9be9ff3..6174a592adcc 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2677,7 +2677,9 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
2677 pll->flags |= SMIAPP_PLL_FLAG_NO_OP_CLOCKS; 2677 pll->flags |= SMIAPP_PLL_FLAG_NO_OP_CLOCKS;
2678 pll->scale_n = sensor->limits[SMIAPP_LIMIT_SCALER_N_MIN]; 2678 pll->scale_n = sensor->limits[SMIAPP_LIMIT_SCALER_N_MIN];
2679 2679
2680 mutex_lock(&sensor->mutex);
2680 rval = smiapp_update_mode(sensor); 2681 rval = smiapp_update_mode(sensor);
2682 mutex_unlock(&sensor->mutex);
2681 if (rval) { 2683 if (rval) {
2682 dev_err(&client->dev, "update mode failed\n"); 2684 dev_err(&client->dev, "update mode failed\n");
2683 goto out_nvm_release; 2685 goto out_nvm_release;