Staging: Merge staging-next into Linus's tree

[sfrench/cifs-2.6.git] / drivers / media / video / gspca / sonixb.c

diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 95354a339e3d3aabd100fd11d26dc893c7e9bee4..204bb3af455999b4733c41383c8db9e61f4c67dc 100644 (file)
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -1251,16 +1251,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
        if (cam->cam_mode[gspca_dev->curr_mode].priv & MODE_RAW) {
                /* In raw mode we sometimes get some garbage after the frame
                   ignore this */
-               struct gspca_frame *frame;
                int used;
                int size = cam->cam_mode[gspca_dev->curr_mode].sizeimage;
 
-               frame = gspca_get_i_frame(gspca_dev);
-               if (frame == NULL) {
-                       gspca_dev->last_packet_type = DISCARD_PACKET;
-                       return;
-               }
-               used = frame->data_end - frame->data;
+               used = gspca_dev->image_len;
                if (used + len > size)
                        len = size - used;
        }