1 files changed, 11 insertions, 13 deletions

diff --git a/drivers/media/video/gspca/pac7302.c b/drivers/media/video/gspca/pac7302.c
index bf47180a4e2f..88cc03bb3f94 100644
--- a/drivers/media/video/gspca/pac7302.c
+++ b/drivers/media/video/gspca/pac7302.c
@@ -804,7 +804,6 @@ static const unsigned char pac_jpeg_header2[] = {
 };
 
 static void pac_start_frame(struct gspca_dev *gspca_dev,
-                struct gspca_frame *frame,
                 __u16 lines, __u16 samples_per_line)
 {
         unsigned char tmpbuf[4];
@@ -829,15 +828,15 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                         int len)                        /* iso packet length */
 {
         struct sd *sd = (struct sd *) gspca_dev;
-        struct gspca_frame *frame;
+        u8 *image;
         unsigned char *sof;
 
         sof = pac_find_sof(&sd->sof_read, data, len);
         if (sof) {
                 int n, lum_offset, footer_length;
 
-                frame = gspca_get_i_frame(gspca_dev);
-                if (frame == NULL) {
+                image = gspca_dev->image;
+                if (image == NULL) {
                         gspca_dev->last_packet_type = DISCARD_PACKET;
                         return;
                 }
@@ -852,16 +851,15 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                 /* Finish decoding current frame */
                 n = (sof - data) - (footer_length + sizeof pac_sof_marker);
                 if (n < 0) {
-                        frame->data_end += n;
+                        gspca_dev->image_len += n;
                         n = 0;
+                } else {
+                        gspca_frame_add(gspca_dev, INTER_PACKET, data, n);
                 }
-                gspca_frame_add(gspca_dev, INTER_PACKET,
-                                        data, n);
-                if (gspca_dev->last_packet_type != DISCARD_PACKET &&
-                                frame->data_end[-2] == 0xff &&
-                                frame->data_end[-1] == 0xd9)
-                        gspca_frame_add(gspca_dev, LAST_PACKET,
-                                                NULL, 0);
+                if (gspca_dev->last_packet_type != DISCARD_PACKET
+                 && image[gspca_dev->image_len - 2] == 0xff
+                 && image[gspca_dev->image_len - 1] == 0xd9)
+                        gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0);
 
                 n = sof - data;
                 len -= n;
@@ -877,7 +875,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 
                 /* Start the new frame with the jpeg header */
                 /* The PAC7302 has the image rotated 90 degrees */
-                pac_start_frame(gspca_dev, frame,
+                pac_start_frame(gspca_dev,
                         gspca_dev->width, gspca_dev->height);
         }
         gspca_frame_add(gspca_dev, INTER_PACKET, data, len);