From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
- return EBUSY instead of EAGAIN.
- add missing break.
- remove unnecessary buf type check (done by the core).
Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
---
drivers/media/usb/hdpvr/hdpvr-video.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
index 406eda8..e14bf49 100644
--- a/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -594,7 +594,7 @@ static int vidioc_s_input(struct file *file, void *private_data,
return -EINVAL;
if (dev->status != STATUS_IDLE)
- return -EAGAIN;
+ return -EBUSY;
retval = hdpvr_config_call(dev, CTRL_VIDEO_INPUT_VALUE, index+1);
if (!retval)
@@ -646,7 +646,7 @@ static int vidioc_s_audio(struct file *file, void *private_data,
return -EINVAL;
if (dev->status != STATUS_IDLE)
- return -EAGAIN;
+ return -EBUSY;
retval = hdpvr_set_audio(dev, audio->index+1, dev->options.audio_codec);
if (!retval)
@@ -777,7 +777,7 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *private_data,
struct v4l2_fmtdesc *f)
{
- if (f->index != 0 || f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+ if (f->index != 0)
return -EINVAL;
f->flags = V4L2_FMT_FLAG_COMPRESSED;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
