summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/adp1653.c
diff options
context:
space:
mode:
authorSakari Ailus2012-01-25 01:05:34 +0100
committerMauro Carvalho Chehab2012-05-14 13:46:27 +0200
commit77e7c4e624404c6edb5686b3d5f873c6008ed6b0 (patch)
tree1ba1d9903bb8eca6e3ca3439d3a5981274ea86ba /drivers/media/video/adp1653.c
parent[media] v4l: Implement v4l2_subdev_link_validate() (diff)
downloadkernel-qcow2-linux-77e7c4e624404c6edb5686b3d5f873c6008ed6b0.tar.gz
kernel-qcow2-linux-77e7c4e624404c6edb5686b3d5f873c6008ed6b0.tar.xz
kernel-qcow2-linux-77e7c4e624404c6edb5686b3d5f873c6008ed6b0.zip
[media] v4l: Allow changing control handler lock
Allow choosing the lock used by the control handler. This may be handy sometimes when a driver providing multiple subdevs does not want to use several locks to serialise its functions. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/adp1653.c')
-rw-r--r--drivers/media/video/adp1653.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/adp1653.c b/drivers/media/video/adp1653.c
index 24afc99d26e4..57e87090388d 100644
--- a/drivers/media/video/adp1653.c
+++ b/drivers/media/video/adp1653.c
@@ -281,19 +281,19 @@ adp1653_init_device(struct adp1653_flash *flash)
return -EIO;
}
- mutex_lock(&flash->ctrls.lock);
+ mutex_lock(flash->ctrls.lock);
/* Reset faults before reading new ones. */
flash->fault = 0;
rval = adp1653_get_fault(flash);
- mutex_unlock(&flash->ctrls.lock);
+ mutex_unlock(flash->ctrls.lock);
if (rval > 0) {
dev_err(&client->dev, "faults detected: 0x%1.1x\n", rval);
return -EIO;
}
- mutex_lock(&flash->ctrls.lock);
+ mutex_lock(flash->ctrls.lock);
rval = adp1653_update_hw(flash);
- mutex_unlock(&flash->ctrls.lock);
+ mutex_unlock(flash->ctrls.lock);
if (rval) {
dev_err(&client->dev,
"adp1653_update_hw failed at %s\n", __func__);