evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] hdpvr: code cleanup

Browse source 
Remove an unnecessary 'else' and invert a condition which makes the code
more readable.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2013-05-29 03:55:14 -03:00 • committed by Mauro Carvalho Chehab
parent ab6e134a48
commit 79f10b625e
1 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/media/usb/hdpvr/hdpvr-video.c
View file

@ -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)
"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;
} }