diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-02-12 07:26:30 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-14 18:58:42 -0400 |
commit | 97caa318b3ced2241cf1eda772a72c9c2ea19abb (patch) | |
tree | 6b9ca2bc2679c6908edd8cca1e217ac77edea686 | |
parent | 41022fcb3db75c9777bbd05da114c7eb597694df (diff) |
[media] hdpvr: small fixes
- 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>
-rw-r--r-- | drivers/media/usb/hdpvr/hdpvr-video.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c index 406eda85f610..e14bf494f107 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, | |||
594 | return -EINVAL; | 594 | return -EINVAL; |
595 | 595 | ||
596 | if (dev->status != STATUS_IDLE) | 596 | if (dev->status != STATUS_IDLE) |
597 | return -EAGAIN; | 597 | return -EBUSY; |
598 | 598 | ||
599 | retval = hdpvr_config_call(dev, CTRL_VIDEO_INPUT_VALUE, index+1); | 599 | retval = hdpvr_config_call(dev, CTRL_VIDEO_INPUT_VALUE, index+1); |
600 | if (!retval) | 600 | if (!retval) |
@@ -646,7 +646,7 @@ static int vidioc_s_audio(struct file *file, void *private_data, | |||
646 | return -EINVAL; | 646 | return -EINVAL; |
647 | 647 | ||
648 | if (dev->status != STATUS_IDLE) | 648 | if (dev->status != STATUS_IDLE) |
649 | return -EAGAIN; | 649 | return -EBUSY; |
650 | 650 | ||
651 | retval = hdpvr_set_audio(dev, audio->index+1, dev->options.audio_codec); | 651 | retval = hdpvr_set_audio(dev, audio->index+1, dev->options.audio_codec); |
652 | if (!retval) | 652 | if (!retval) |
@@ -777,7 +777,7 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *private_data, | |||
777 | struct v4l2_fmtdesc *f) | 777 | struct v4l2_fmtdesc *f) |
778 | { | 778 | { |
779 | 779 | ||
780 | if (f->index != 0 || f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) | 780 | if (f->index != 0) |
781 | return -EINVAL; | 781 | return -EINVAL; |
782 | 782 | ||
783 | f->flags = V4L2_FMT_FLAG_COMPRESSED; | 783 | f->flags = V4L2_FMT_FLAG_COMPRESSED; |