From 063303e7981f6bea8f0dcfcdcc0904f7fdc77bc9 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Sun, 17 Jan 2010 03:42:14 -0300 Subject: [PATCH] --- yaml --- r: 181593 b: refs/heads/master c: 11edebc264f14d3f9e05525f238b91da7f5fa81f h: refs/heads/master i: 181591: 2a834bccee20af4ee668aa0db359fd58db7827a2 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/ov534.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4bbb4025d9e5..759d400418c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29b87f045552910f964972b7a45e9be054401a0b +refs/heads/master: 11edebc264f14d3f9e05525f238b91da7f5fa81f diff --git a/trunk/drivers/media/video/gspca/ov534.c b/trunk/drivers/media/video/gspca/ov534.c index c02784bbe95a..957e05e2d08f 100644 --- a/trunk/drivers/media/video/gspca/ov534.c +++ b/trunk/drivers/media/video/gspca/ov534.c @@ -992,9 +992,9 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, frame = gspca_get_i_frame(gspca_dev); if (frame == NULL) goto discard; - if (frame->data_end - frame->data != + if (frame->data_end - frame->data + (len - 12) != gspca_dev->width * gspca_dev->height * 2) { - PDEBUG(D_PACK, "short frame"); + PDEBUG(D_PACK, "wrong sized frame"); goto discard; } gspca_frame_add(gspca_dev, LAST_PACKET,