From ae245221c64d0a37d3d816944617154093411343 Mon Sep 17 00:00:00 2001
From: Jean-Francois Moine <moinejf@free.fr>
Date: Sat, 26 Dec 2009 08:41:17 -0300
Subject: [PATCH] --- yaml --- r: 179423 b: refs/heads/master c:
 9501843496aaf85fe1767b534c4720622c4425c4 h: refs/heads/master i:   179421:
 222489823d25bf0db6760634abef71cafa0dd630   179419:
 bc0540000957d85b3958dd0a99211878b087f856   179415:
 5621e13de401b23e802326d6e4ee39049034e853   179407:
 4c140a9cf43ee8a70b5bf407507d9f7be6bdcb29   179391:
 43a1d6f0d1b61c13a5ee2e9d3d4fec3d20d6d4de v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/gspca/vc032x.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1514799cf315..b38f026caada 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c60503c1db76bd46577cc7ff4fafa033b675e0e5
+refs/heads/master: 9501843496aaf85fe1767b534c4720622c4425c4
diff --git a/trunk/drivers/media/video/gspca/vc032x.c b/trunk/drivers/media/video/gspca/vc032x.c
index c090efcd8045..71921c878424 100644
--- a/trunk/drivers/media/video/gspca/vc032x.c
+++ b/trunk/drivers/media/video/gspca/vc032x.c
@@ -3009,6 +3009,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 		int l;
 
 		frame = gspca_get_i_frame(gspca_dev);
+		if (frame == NULL) {
+			gspca_dev->last_packet_type = DISCARD_PACKET;
+			return;
+		}
 		l = frame->data_end - frame->data;
 		if (len > frame->v4l2_buf.length - l)
 			len = frame->v4l2_buf.length - l;