diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-04-19 11:36:03 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-19 16:23:55 -0400 |
commit | d1c754a9326d95dff93bfe8004cba8574a7a20a8 (patch) | |
tree | 2fd7dedd41270de9717dd87bfb8eb285d3bcfd62 /drivers | |
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>
Diffstat (limited to 'drivers')
-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 be49f68ddf37..35fde4e931f5 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, | |||
1137 | } | 1137 | } |
1138 | 1138 | ||
1139 | default: | 1139 | default: |
1140 | return -EINVAL; | 1140 | return -ENOTTY; |
1141 | } | 1141 | } |
1142 | return 0; | 1142 | return 0; |
1143 | } | 1143 | } |
diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c index 20cf271a774b..49a845fb804a 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, | |||
1761 | } | 1761 | } |
1762 | break; | 1762 | break; |
1763 | default: | 1763 | default: |
1764 | ret = -EINVAL; | 1764 | ret = -ENOTTY; |
1765 | } | 1765 | } |
1766 | unlock_out: | 1766 | unlock_out: |
1767 | mutex_unlock(&vpfe_dev->lock); | 1767 | mutex_unlock(&vpfe_dev->lock); |
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index 989e556913ed..a151271f60e1 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, | |||
1827 | return ivtv_decoder_ioctls(file, cmd, (void *)arg); | 1827 | return ivtv_decoder_ioctls(file, cmd, (void *)arg); |
1828 | 1828 | ||
1829 | default: | 1829 | default: |
1830 | return -EINVAL; | 1830 | return -ENOTTY; |
1831 | } | 1831 | } |
1832 | return 0; | 1832 | return 0; |
1833 | } | 1833 | } |
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index b09a3c80a15e..7bc775219f97 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, | |||
1570 | return meyeioc_stilljcapt((int *) arg); | 1570 | return meyeioc_stilljcapt((int *) arg); |
1571 | 1571 | ||
1572 | default: | 1572 | default: |
1573 | return -EINVAL; | 1573 | return -ENOTTY; |
1574 | } | 1574 | } |
1575 | 1575 | ||
1576 | } | 1576 | } |
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c index 2e4131748438..ca3f70f0bad5 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, | |||
688 | /* | 688 | /* |
689 | DEB2(pr_err("does not handle this ioctl\n")); | 689 | DEB2(pr_err("does not handle this ioctl\n")); |
690 | */ | 690 | */ |
691 | return -ENOIOCTLCMD; | 691 | return -ENOTTY; |
692 | } | 692 | } |
693 | return 0; | 693 | return 0; |
694 | } | 694 | } |