diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2011-02-24 08:42:24 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 15:37:55 -0400 |
commit | 0f62fd6a2fa12d6a63cbb18f9e30b05345f636f6 (patch) | |
tree | b5963e3b4a5e859949f0f76b96c58c503a30efa4 /drivers/media/video/v4l2-device.c | |
parent | 022654930891c7ddfdb1ea34d6c4af9d1096bf91 (diff) |
[media] v4l2: add v4l2_prio_state to v4l2_device and video_device
Integrate the v4l2_prio_state into the core, ready for use.
One struct v4l2_prio_state is added to v4l2_device and a pointer
to a prio state is added to video_device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
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 a1afda352d08..fd7a445ce34c 100644 --- a/drivers/media/video/v4l2-device.c +++ b/drivers/media/video/v4l2-device.c | |||
@@ -36,6 +36,7 @@ int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev) | |||
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 | mutex_init(&v4l2_dev->ioctl_lock); |
39 | v4l2_prio_init(&v4l2_dev->prio); | ||
39 | v4l2_dev->dev = dev; | 40 | v4l2_dev->dev = dev; |
40 | if (dev == NULL) { | 41 | if (dev == NULL) { |
41 | /* If dev == NULL, then name must be filled in by the caller */ | 42 | /* If dev == NULL, then name must be filled in by the caller */ |