projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[cascardo/linux.git]
/
drivers
/
media
/
video
/
v4l2-device.c
diff --git
a/drivers/media/video/v4l2-device.c
b/drivers/media/video/v4l2-device.c
index
0b08f96
..
7fe6f92
100644
(file)
--- a/
drivers/media/video/v4l2-device.c
+++ b/
drivers/media/video/v4l2-device.c
@@
-35,6
+35,7
@@
int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev)
INIT_LIST_HEAD(&v4l2_dev->subdevs);
spin_lock_init(&v4l2_dev->lock);
+ mutex_init(&v4l2_dev->ioctl_lock);
v4l2_dev->dev = dev;
if (dev == NULL) {
/* If dev == NULL, then name must be filled in by the caller */