UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] gspca: Fix querycap and incorrect return codes 

Add V4L2_CAP_DEVICE_CAPS support to querycap and replace -EINVAL by
-ENOTTY whenever an ioctl is not supported.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2012-05-06 09:28:21 -03:00 committed by Mauro Carvalho Chehab
parent d57fb9f8a6
commit cc7b6f257d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/media/video/gspca/gspca.c
View File

@ -1066,10 +1066,10 @@ static int vidioc_g_register(struct file *file, void *priv,
struct gspca_dev *gspca_dev = video_drvdata(file); struct gspca_dev *gspca_dev = video_drvdata(file);
if (!gspca_dev->sd_desc->get_chip_ident) if (!gspca_dev->sd_desc->get_chip_ident)
return -EINVAL; return -ENOTTY;
if (!gspca_dev->sd_desc->get_register) if (!gspca_dev->sd_desc->get_register)
return -EINVAL; return -ENOTTY;
if (mutex_lock_interruptible(&gspca_dev->usb_lock)) if (mutex_lock_interruptible(&gspca_dev->usb_lock))
return -ERESTARTSYS; return -ERESTARTSYS;
@ -1090,10 +1090,10 @@ static int vidioc_s_register(struct file *file, void *priv,
struct gspca_dev *gspca_dev = video_drvdata(file); struct gspca_dev *gspca_dev = video_drvdata(file);
if (!gspca_dev->sd_desc->get_chip_ident) if (!gspca_dev->sd_desc->get_chip_ident)
return -EINVAL; return -ENOTTY;
if (!gspca_dev->sd_desc->set_register) if (!gspca_dev->sd_desc->set_register)
return -EINVAL; return -ENOTTY;
if (mutex_lock_interruptible(&gspca_dev->usb_lock)) if (mutex_lock_interruptible(&gspca_dev->usb_lock))
return -ERESTARTSYS; return -ERESTARTSYS;
@ -1115,7 +1115,7 @@ static int vidioc_g_chip_ident(struct file *file, void *priv,
struct gspca_dev *gspca_dev = video_drvdata(file); struct gspca_dev *gspca_dev = video_drvdata(file);
if (!gspca_dev->sd_desc->get_chip_ident) if (!gspca_dev->sd_desc->get_chip_ident)
return -EINVAL; return -ENOTTY;
if (mutex_lock_interruptible(&gspca_dev->usb_lock)) if (mutex_lock_interruptible(&gspca_dev->usb_lock))
return -ERESTARTSYS; return -ERESTARTSYS;
@ -1410,9 +1410,10 @@ static int vidioc_querycap(struct file *file, void *priv,
} }
usb_make_path(gspca_dev->dev, (char *) cap->bus_info, usb_make_path(gspca_dev->dev, (char *) cap->bus_info,
sizeof(cap->bus_info)); sizeof(cap->bus_info));
cap->capabilities = V4L2_CAP_VIDEO_CAPTURE cap->device_caps = V4L2_CAP_VIDEO_CAPTURE
| V4L2_CAP_STREAMING | V4L2_CAP_STREAMING
| V4L2_CAP_READWRITE; | V4L2_CAP_READWRITE;
cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
ret = 0; ret = 0;
out: out:
mutex_unlock(&gspca_dev->usb_lock); mutex_unlock(&gspca_dev->usb_lock);
@ -1565,7 +1566,7 @@ static int vidioc_querymenu(struct file *file, void *priv,
struct gspca_dev *gspca_dev = video_drvdata(file); struct gspca_dev *gspca_dev = video_drvdata(file);
if (!gspca_dev->sd_desc->querymenu) if (!gspca_dev->sd_desc->querymenu)
return -EINVAL; return -ENOTTY;
return gspca_dev->sd_desc->querymenu(gspca_dev, qmenu); return gspca_dev->sd_desc->querymenu(gspca_dev, qmenu);
} }
@ -1774,7 +1775,7 @@ static int vidioc_g_jpegcomp(struct file *file, void *priv,
int ret; int ret;
if (!gspca_dev->sd_desc->get_jcomp) if (!gspca_dev->sd_desc->get_jcomp)
return -EINVAL; return -ENOTTY;
if (mutex_lock_interruptible(&gspca_dev->usb_lock)) if (mutex_lock_interruptible(&gspca_dev->usb_lock))
return -ERESTARTSYS; return -ERESTARTSYS;
gspca_dev->usb_err = 0; gspca_dev->usb_err = 0;
@ -1793,7 +1794,7 @@ static int vidioc_s_jpegcomp(struct file *file, void *priv,
int ret; int ret;
if (!gspca_dev->sd_desc->set_jcomp) if (!gspca_dev->sd_desc->set_jcomp)
return -EINVAL; return -ENOTTY;
if (mutex_lock_interruptible(&gspca_dev->usb_lock)) if (mutex_lock_interruptible(&gspca_dev->usb_lock))
return -ERESTARTSYS; return -ERESTARTSYS;
gspca_dev->usb_err = 0; gspca_dev->usb_err = 0;