Skip to content

Commit

Permalink
[media] hdpvr: small fixes
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Apr 14, 2013
1 parent 41022fc commit 97caa31
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/media/usb/hdpvr/hdpvr-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 97caa31

Please sign in to comment.