aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorKalimochoAz <calimochoazucarado@gmail.com>2012-03-01 18:16:57 +0100
committerKalimochoAz <calimochoazucarado@gmail.com>2012-03-01 18:16:57 +0100
commit949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73 (patch)
tree9a268cbb25992fdd7147e8af72f68d315ef4caeb /drivers/media/video
parent74374e40791f1f7b58252df275dd5227ead88b89 (diff)
parentbf6a68d2a214e07f7c0d6538e00e17b826714160 (diff)
downloadkernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.zip
kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.tar.gz
kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.tar.bz2
Merge branch 'linux-3.0.y' into cm.ics
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/hdpvr/hdpvr-video.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
index 514aea7..4c0394a 100644
--- a/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/drivers/media/video/hdpvr/hdpvr-video.c
@@ -284,12 +284,13 @@ static int hdpvr_start_streaming(struct hdpvr_device *dev)
hdpvr_config_call(dev, CTRL_START_STREAMING_VALUE, 0x00);
+ dev->status = STATUS_STREAMING;
+
INIT_WORK(&dev->worker, hdpvr_transmit_buffers);
queue_work(dev->workqueue, &dev->worker);
v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev,
"streaming started\n");
- dev->status = STATUS_STREAMING;
return 0;
}