diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-04-19 12:36:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-19 17:23:55 -0300 |
| commit | d1c754a9326d95dff93bfe8004cba8574a7a20a8 (patch) | |
| tree | 2fd7dedd41270de9717dd87bfb8eb285d3bcfd62 | |
| parent | ee71e7b3ae1780e4475aa5dd980dd99c0309079b (diff) | |
[media] V4L2: drivers implementing vidioc_default should also return -ENOTTY
If the vidioc_default implementation doesn't support the ioctl, then drivers
must return -ENOTTY instead of -EINVAL.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/cx18/cx18-ioctl.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/davinci/vpfe_capture.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-ioctl.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/meye.c | 2 | ||||
| -rw-r--r-- | drivers/media/video/mxb.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c index be49f68ddf3..35fde4e931f 100644 --- a/drivers/media/video/cx18/cx18-ioctl.c +++ b/drivers/media/video/cx18/cx18-ioctl.c @@ -1137,7 +1137,7 @@ static long cx18_default(struct file *file, void *fh, bool valid_prio, } default: - return -EINVAL; + return -ENOTTY; } return 0; } diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c index 20cf271a774..49a845fb804 100644 --- a/drivers/media/video/davinci/vpfe_capture.c +++ b/drivers/media/video/davinci/vpfe_capture.c @@ -1761,7 +1761,7 @@ static long vpfe_param_handler(struct file *file, void *priv, } break; default: - ret = -EINVAL; + ret = -ENOTTY; } unlock_out: mutex_unlock(&vpfe_dev->lock); diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index 989e556913e..a151271f60e 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c @@ -1827,7 +1827,7 @@ static long ivtv_default(struct file *file, void *fh, bool valid_prio, return ivtv_decoder_ioctls(file, cmd, (void *)arg); default: - return -EINVAL; + return -ENOTTY; } return 0; } diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index b09a3c80a15..7bc775219f9 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c @@ -1570,7 +1570,7 @@ static long vidioc_default(struct file *file, void *fh, bool valid_prio, return meyeioc_stilljcapt((int *) arg); default: - return -EINVAL; + return -ENOTTY; } } diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c index 2e413174843..ca3f70f0bad 100644 --- a/drivers/media/video/mxb.c +++ b/drivers/media/video/mxb.c @@ -688,7 +688,7 @@ static long vidioc_default(struct file *file, void *fh, bool valid_prio, /* DEB2(pr_err("does not handle this ioctl\n")); */ - return -ENOIOCTLCMD; + return -ENOTTY; } return 0; } |