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;