V4L/DVB: gspca - main: Don't use the frame buffer flags

[karo-tx-linux.git] / drivers / media / video / gspca / cpia1.c

diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c
index 4b3ea3b4bbbaa90b33c103f09241fb5e53f31611..3747a1dcff5467682bbf8918ec67c7bc0ddf0796 100644 (file)
--- a/drivers/media/video/gspca/cpia1.c
+++ b/drivers/media/video/gspca/cpia1.c
@@ -1765,14 +1765,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                atomic_set(&sd->cam_exposure, data[39] * 2);
                atomic_set(&sd->fps, data[41]);
 
-               image = gspca_dev->image;
-               if (image == NULL) {
-                       gspca_dev->last_packet_type = DISCARD_PACKET;
-                       return;
-               }
-
                /* Check for proper EOF for last frame */
-               if (gspca_dev->image_len > 4 &&
+               image = gspca_dev->image;
+               if (image != NULL &&
+                   gspca_dev->image_len > 4 &&
                    image[gspca_dev->image_len - 4] == 0xff &&
                    image[gspca_dev->image_len - 3] == 0xff &&
                    image[gspca_dev->image_len - 2] == 0xff &&