From da96b1115a0aaf0dd20ade270ffa69bc3a4ccdb3 Mon Sep 17 00:00:00 2001
From: Jean-Francois Moine <moinejf@free.fr>
Date: Thu, 4 Dec 2008 05:06:08 -0300
Subject: [PATCH] --- yaml --- r: 124378 b: refs/heads/master c:
 8c252050146fc6f54e9bf5ef8276b25f3dd67a1c h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/media/video/gspca/ov534.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d538b696a0cf..e79a3cc8148a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb139224aea3b56237542690516eb9d6d671b135
+refs/heads/master: 8c252050146fc6f54e9bf5ef8276b25f3dd67a1c
diff --git a/trunk/drivers/media/video/gspca/ov534.c b/trunk/drivers/media/video/gspca/ov534.c
index e02c8f70f814..28a7982792b3 100644
--- a/trunk/drivers/media/video/gspca/ov534.c
+++ b/trunk/drivers/media/video/gspca/ov534.c
@@ -48,6 +48,8 @@ static int frame_rate;
 /* specific webcam descriptor */
 struct sd {
 	struct gspca_dev gspca_dev;	/* !! must be the first item */
+	__u32 last_fid;
+	__u32 last_pts;
 };
 
 /* V4L2 controls supported by the driver */
@@ -397,9 +399,8 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
 static void sd_pkt_scan(struct gspca_dev *gspca_dev, struct gspca_frame *frame,
 			__u8 *data, int len)
 {
-	static __u32 last_pts;
+	struct sd *sd = (struct sd *) gspca_dev;
 	__u32 this_pts;
-	static int last_fid;
 	int this_fid;
 
 	/* Payloads are prefixed with a the UVC-style header.  We
@@ -428,10 +429,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, struct gspca_frame *frame,
 	this_fid = (data[1] & UVC_STREAM_FID) ? 1 : 0;
 
 	/* If PTS or FID has changed, start a new frame. */
-	if (this_pts != last_pts || this_fid != last_fid) {
+	if (this_pts != sd->last_pts || this_fid != sd->last_fid) {
 		gspca_frame_add(gspca_dev, FIRST_PACKET, frame, NULL, 0);
-		last_pts = this_pts;
-		last_fid = this_fid;
+		sd->last_pts = this_pts;
+		sd->last_fid = this_fid;
 	}
 
 	/* Add the data from this payload */
@@ -440,7 +441,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, struct gspca_frame *frame,
 
 	/* If this packet is marked as EOF, end the frame */
 	if (data[1] & UVC_STREAM_EOF) {
-		last_pts = 0;
+		sd->last_pts = 0;
 
 		if ((frame->data_end - frame->data) !=
 		    (gspca_dev->width * gspca_dev->height * 2)) {