From: Jean-Francois Moine Date: Wed, 19 Aug 2009 21:46:18 +0000 (-0400) Subject: gspca - ov534: Fix ov772x X-Git-Tag: v2.6.30.6~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85fa9e247d081a087bed949983dde603a46114dc;p=thirdparty%2Fkernel%2Fstable.git gspca - ov534: Fix ov772x 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 Acked-by: Jean-Francois Moine Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c index 19e0bc60de14a..504f849fb31f7 100644 --- 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 *gspca_dev, struct gspca_frame *frame, __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