diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-06-12 03:20:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 19:07:44 -0300 |
| commit | c874f3aa7e66158dccb2b9f3cfc46c65af6c223d (patch) | |
| tree | 72ad1a610908efb00bc00a4ccb76ba8e0c7fda3c /drivers/media/video/gspca/ov534.c | |
| parent | a0001a289f667e254eba51f2f729ec677daba503 (diff) | |
| download | kernel_samsung_smdk4412-c874f3aa7e66158dccb2b9f3cfc46c65af6c223d.zip kernel_samsung_smdk4412-c874f3aa7e66158dccb2b9f3cfc46c65af6c223d.tar.gz kernel_samsung_smdk4412-c874f3aa7e66158dccb2b9f3cfc46c65af6c223d.tar.bz2 | |
V4L/DVB (11973): gspca - ov534: Do the ov772x work again.
The scan of the image packets of the sensor ov772x was broken when
the sensor ov965x was added.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/ov534.c')
| -rw-r--r-- | drivers/media/video/gspca/ov534.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c index 8d2164d..4b528b3 100644 --- a/drivers/media/video/gspca/ov534.c +++ b/drivers/media/video/gspca/ov534.c @@ -948,9 +948,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 = gspca_dev->cam.bulk ? 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 |