diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 00:37:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 00:37:36 -0300 |
| commit | 52f9a4e5b2eae78dceb70971ee7df8e1db330239 (patch) | |
| tree | 56a3b69004fa80da2a2d9afb6498b79db9fea434 /linux/drivers/media/video/gspca/ov534.c | |
| parent | 6e323483b126ac7589cadb5bad2f666cf4b7eb9d (diff) | |
| parent | a2aa04e72cd03545056bd4a9a7cdd6b340908ca2 (diff) | |
| download | mediapointer-dvb-s2-52f9a4e5b2eae78dceb70971ee7df8e1db330239.tar.gz mediapointer-dvb-s2-52f9a4e5b2eae78dceb70971ee7df8e1db330239.tar.bz2 | |
merge: http://kernellabs.com/hg/~dheitmueller/em28xx-no-audio
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/ov534.c')
| -rw-r--r-- | linux/drivers/media/video/gspca/ov534.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/gspca/ov534.c b/linux/drivers/media/video/gspca/ov534.c index 14341b6be..21a9366c7 100644 --- a/linux/drivers/media/video/gspca/ov534.c +++ b/linux/drivers/media/video/gspca/ov534.c @@ -958,9 +958,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 |