diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-27 15:17:56 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-27 15:17:56 -0800 |
| commit | 4fc06ddbef136c998293df7c7216f8fd2f821a6f (patch) | |
| tree | 14be927fec6832d6311ddeee92508ac4d27c68d3 | |
| parent | 299aa85c191bb975860ae689deec0cb18b34d17c (diff) | |
| download | longterm-queue-2.6.32-4fc06ddbef136c998293df7c7216f8fd2f821a6f.tar.gz | |
2.6.32-stable patches
added patches:
hdpvr-fix-race-conditon-during-start-of-streaming.patch
| -rw-r--r-- | queue-2.6.32/hdpvr-fix-race-conditon-during-start-of-streaming.patch | 37 | ||||
| -rw-r--r-- | queue-2.6.32/series | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/queue-2.6.32/hdpvr-fix-race-conditon-during-start-of-streaming.patch b/queue-2.6.32/hdpvr-fix-race-conditon-during-start-of-streaming.patch new file mode 100644 index 0000000..972db31 --- /dev/null +++ b/queue-2.6.32/hdpvr-fix-race-conditon-during-start-of-streaming.patch @@ -0,0 +1,37 @@ +From afa159538af61f1a65d48927f4e949fe514fb4fc Mon Sep 17 00:00:00 2001 +From: Janne Grunau <j@jannau.net> +Date: Thu, 2 Feb 2012 13:35:21 -0300 +Subject: [media] hdpvr: fix race conditon during start of streaming + +From: Janne Grunau <j@jannau.net> + +commit afa159538af61f1a65d48927f4e949fe514fb4fc upstream. + +status has to be set to STREAMING before the streaming worker is +queued. hdpvr_transmit_buffers() will exit immediately otherwise. + +Reported-by: Joerg Desch <vvd.joede@googlemail.com> +Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + drivers/media/video/hdpvr/hdpvr-video.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/media/video/hdpvr/hdpvr-video.c ++++ b/drivers/media/video/hdpvr/hdpvr-video.c +@@ -279,12 +279,13 @@ static int hdpvr_start_streaming(struct + + 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; + } diff --git a/queue-2.6.32/series b/queue-2.6.32/series index d68e7e2..0d62152 100644 --- a/queue-2.6.32/series +++ b/queue-2.6.32/series @@ -20,3 +20,4 @@ arm-7325-1-fix-v7-boot-with-lockdep-enabled.patch usb-added-kamstrup-vid-pids-to-cp210x-serial-driver.patch usb-fix-handoff-when-bios-disables-host-pci-device.patch xhci-fix-encoding-for-hs-bulk-control-nak-rate.patch +hdpvr-fix-race-conditon-during-start-of-streaming.patch |