diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-23 03:48:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-23 03:48:41 -0500 |
| commit | 26e20a108caca6231c6a5ec659f815a866904751 (patch) | |
| tree | 36932c208a9e8994bfd7ed4eaf48b9c33f71fbe3 /drivers/media/video/v4l2-device.c | |
| parent | 691513f70d3957939a318da970987b876c720861 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into x86/security
Diffstat (limited to 'drivers/media/video/v4l2-device.c')
| -rw-r--r-- | drivers/media/video/v4l2-device.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c index 0b08f96b74a5..7fe6f92af480 100644 --- 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) | |||
| 35 | 35 | ||
| 36 | INIT_LIST_HEAD(&v4l2_dev->subdevs); | 36 | INIT_LIST_HEAD(&v4l2_dev->subdevs); |
| 37 | spin_lock_init(&v4l2_dev->lock); | 37 | spin_lock_init(&v4l2_dev->lock); |
| 38 | mutex_init(&v4l2_dev->ioctl_lock); | ||
| 38 | v4l2_dev->dev = dev; | 39 | v4l2_dev->dev = dev; |
| 39 | if (dev == NULL) { | 40 | if (dev == NULL) { |
| 40 | /* If dev == NULL, then name must be filled in by the caller */ | 41 | /* If dev == NULL, then name must be filled in by the caller */ |