[media] hdpvr: small fixes
authorHans Verkuil <hans.verkuil@cisco.com>
Tue, 12 Feb 2013 12:26:30 +0000 (09:26 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 14 Apr 2013 22:58:42 +0000 (19:58 -0300)
- return EBUSY instead of EAGAIN.
- add missing break.
- remove unnecessary buf type check (done by the core).

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/usb/hdpvr/hdpvr-video.c

index 406eda85f610af3368cc03952656f249d7a097e5..e14bf494f1070195936f649b678b6be188e438fa 100644 (file)
@@ -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;