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 785eeb4c20144573416c44f8b970198e74730ba6..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;
        }
@@ -1453,9 +1447,7 @@ static const struct usb_device_id device_table[] __devinitconst = {
        {USB_DEVICE(0x0c45, 0x6029), SB(PAS106, 102)},
        {USB_DEVICE(0x0c45, 0x602c), SB(OV7630, 102)},
        {USB_DEVICE(0x0c45, 0x602d), SB(HV7131R, 102)},
-#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
        {USB_DEVICE(0x0c45, 0x602e), SB(OV7630, 102)},
-#endif
        {USB_DEVICE(0x0c45, 0x608f), SB(OV7630, 103)},
 #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
        {USB_DEVICE(0x0c45, 0x60af), SB(PAS202, 103)},