diff options
author | Laurent Pinchart <laurent.pinchart@skynet.be> | 2008-12-16 04:46:32 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:39:11 -0500 |
commit | 9768352ac1f9cc3aae675adb299452bd28a54734 (patch) | |
tree | eac3d5caefbcccae4b6cdb877aa86b581ea1e7ba /drivers/media/video/uvc/uvc_v4l2.c | |
parent | 6df126f834c7f6972528cba43604ce0c97329886 (diff) |
V4L/DVB (9903): uvcvideo: V4L2 zoom controls support
Add support for absolute and continuous zoom controls (mapped to absolute
and relative UVC zoom controls).
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc/uvc_v4l2.c')
-rw-r--r-- | drivers/media/video/uvc/uvc_v4l2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c index 7b1c1363583c..2e1fd1b2a619 100644 --- a/drivers/media/video/uvc/uvc_v4l2.c +++ b/drivers/media/video/uvc/uvc_v4l2.c | |||
@@ -914,7 +914,7 @@ static int uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
914 | if (!capable(CAP_SYS_ADMIN)) | 914 | if (!capable(CAP_SYS_ADMIN)) |
915 | return -EPERM; | 915 | return -EPERM; |
916 | 916 | ||
917 | info = kmalloc(sizeof *info, GFP_KERNEL); | 917 | info = kzalloc(sizeof *info, GFP_KERNEL); |
918 | if (info == NULL) | 918 | if (info == NULL) |
919 | return -ENOMEM; | 919 | return -ENOMEM; |
920 | 920 | ||
@@ -941,7 +941,7 @@ static int uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
941 | if (!capable(CAP_SYS_ADMIN)) | 941 | if (!capable(CAP_SYS_ADMIN)) |
942 | return -EPERM; | 942 | return -EPERM; |
943 | 943 | ||
944 | map = kmalloc(sizeof *map, GFP_KERNEL); | 944 | map = kzalloc(sizeof *map, GFP_KERNEL); |
945 | if (map == NULL) | 945 | if (map == NULL) |
946 | return -ENOMEM; | 946 | return -ENOMEM; |
947 | 947 | ||