summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/hdpvr/hdpvr-video.c
diff options
context:
space:
mode:
authorLeonid Kegulskiy2013-04-25 10:59:56 +0200
committerMauro Carvalho Chehab2013-05-21 13:20:24 +0200
commitf74368769048a803e7a7a3dac6434833f563d3bd (patch)
treef6e24256f0e19d8fb848e8dd96f6787c98de0dad /drivers/media/usb/hdpvr/hdpvr-video.c
parent[media] hdpvr: Removed unnecessary get_video_info() call from hdpvr_device_in... (diff)
downloadkernel-qcow2-linux-f74368769048a803e7a7a3dac6434833f563d3bd.tar.gz
kernel-qcow2-linux-f74368769048a803e7a7a3dac6434833f563d3bd.tar.xz
kernel-qcow2-linux-f74368769048a803e7a7a3dac6434833f563d3bd.zip
[media] hdpvr: Added some error handling in hdpvr_start_streaming()
Signed-off-by: Leonid Kegulskiy <leo@lumanate.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/hdpvr/hdpvr-video.c')
-rw-r--r--drivers/media/usb/hdpvr/hdpvr-video.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
index 774ba0e820be..cd90ba81a5bb 100644
--- a/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -298,8 +298,12 @@ static int hdpvr_start_streaming(struct hdpvr_device *dev)
0xb8, 0x38, 0x1, 0, NULL, 0, 8000);
v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev,
"encoder start control request returned %d\n", ret);
+ if (ret < 0)
+ return ret;
- hdpvr_config_call(dev, CTRL_START_STREAMING_VALUE, 0x00);
+ ret = hdpvr_config_call(dev, CTRL_START_STREAMING_VALUE, 0x00);
+ if (ret)
+ return ret;
dev->status = STATUS_STREAMING;