Prev: [patch 38/48] kthreads: fix kthread_create() vs kthread_stop() race
Next: [patch 54/71] xfs: fix spin_is_locked assert on uni-processor builds
From: Greg KH on 4 Sep 2009 20:30
2.6.30-stable review patch. If anyone has any objections, please let us know.

------------------
From: Jean-Francois Moine <moinejf(a)free.fr>

The scan of the image packets of the sensor ov772x was broken when
the sensor ov965x was added.

[ Based on upstream c874f3aa, modified slightly for v2.6.30.5 ]

Signed-off-by: Jim Paris <jim(a)jtan.com>
Acked-by: Jean-Francois Moine <moinejf(a)free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
drivers/media/video/gspca/ov534.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

--- a/drivers/media/video/gspca/ov534.c
+++ b/drivers/media/video/gspca/ov534.c
@@ -832,9 +832,11 @@ static void sd_pkt_scan(struct gspca_dev
__u32 this_pts;
u16 this_fid;
int remaining_len = len;
+ int payload_len;

+ payload_len = (sd->sensor == SENSOR_OV772X) ? 2048 : 2040;
do {
- len = min(remaining_len, 2040); /*fixme: was 2048*/
+ len = min(remaining_len, payload_len);

/* Payloads are prefixed with a UVC-style header. We
consider a frame to start when the FID toggles, or the PTS


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [patch 38/48] kthreads: fix kthread_create() vs kthread_stop() race
Next: [patch 54/71] xfs: fix spin_is_locked assert on uni-processor builds