Commit 79f10b62 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] hdpvr: code cleanup

Remove an unnecessary 'else' and invert a condition which makes the code
more readable.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ab6e134a
...@@ -281,12 +281,17 @@ static int hdpvr_start_streaming(struct hdpvr_device *dev) ...@@ -281,12 +281,17 @@ static int hdpvr_start_streaming(struct hdpvr_device *dev)
if (dev->status == STATUS_STREAMING) if (dev->status == STATUS_STREAMING)
return 0; return 0;
else if (dev->status != STATUS_IDLE) if (dev->status != STATUS_IDLE)
return -EAGAIN; return -EAGAIN;
ret = get_video_info(dev, &vidinf); ret = get_video_info(dev, &vidinf);
if (ret) {
msleep(250);
v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev,
"no video signal at input %d\n", dev->options.video_input);
return -EAGAIN;
}
if (!ret) {
v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev, v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev,
"video signal: %dx%d@%dhz\n", vidinf.width, "video signal: %dx%d@%dhz\n", vidinf.width,
vidinf.height, vidinf.fps); vidinf.height, vidinf.fps);
...@@ -313,11 +318,6 @@ static int hdpvr_start_streaming(struct hdpvr_device *dev) ...@@ -313,11 +318,6 @@ static int hdpvr_start_streaming(struct hdpvr_device *dev)
"streaming started\n"); "streaming started\n");
return 0; return 0;
}
msleep(250);
v4l2_dbg(MSG_INFO, hdpvr_debug, &dev->v4l2_dev,
"no video signal at input %d\n", dev->options.video_input);
return -EAGAIN;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment