Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (345 commits)
  V4L/DVB (13542): ir-keytable: Allow dynamic table change
  V4L/DVB (13541): atbm8830: replace 64-bit division and floating point usage
  V4L/DVB (13540): ir-common: Cleanup get key evdev code
  V4L/DVB (13539): ir-common: add __func__ for debug messages
  V4L/DVB (13538): ir-common: Use a dynamic keycode table
  V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
  V4L/DVB (13536): em28xx: Use the full RC5 code on HVR-950 Remote Controller
  V4L/DVB (13535): ir-common: Add a hauppauge new table with the complete RC5 code
  V4L/DVB (13534): ir-common: Remove some unused fields/structs
  V4L/DVB (13533): ir: use dynamic tables, instead of static ones
  V4L/DVB (13532): ir-common: Add infrastructure to use a dynamic keycode table
  V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it
  V4L/DVB (13458): go7007: subdev conversion
  V4L/DVB (13457): s2250: subdev conversion
  V4L/DVB (13456): s2250: Change module structure
  V4L/DVB (13528): em28xx: add support for em2800 VC211A card
  em28xx: don't reduce scale to half size for em2800
  em28xx: don't load audio modules when AC97 is mis-detected
  em28xx: em2800 chips support max width of 640
  V4L/DVB (13523): dvb-bt8xx: fix compile warning
  ...

Fix up trivial conflicts due to spelling fixes from the trivial tree in
	Documentation/video4linux/gspca.txt
	drivers/media/video/cx18/cx18-mailbox.h

1 files changed, 10 insertions, 24 deletions

diff --git a/drivers/media/video/gspca/jeilinj.c b/drivers/media/video/gspca/jeilinj.c
index a11c97ebeb0f..2019b04f9235 100644
--- a/drivers/media/video/gspca/jeilinj.c
+++ b/drivers/media/video/gspca/jeilinj.c
@@ -181,11 +181,9 @@ static void jlj_dostream(struct work_struct *work)
 {
         struct sd *dev = container_of(work, struct sd, work_struct);
         struct gspca_dev *gspca_dev = &dev->gspca_dev;
-        struct gspca_frame *frame;
         int blocks_left; /* 0x200-sized blocks remaining in current frame. */
         int size_in_blocks;
         int act_len;
-        int discarding = 0; /* true if we failed to get space for frame. */
         int packet_type;
         int ret;
         u8 *buffer;
@@ -196,15 +194,6 @@ static void jlj_dostream(struct work_struct *work)
                 goto quit_stream;
         }
         while (gspca_dev->present && gspca_dev->streaming) {
-                if (!gspca_dev->present)
-                        goto quit_stream;
-                /* Start a new frame, and add the JPEG header, first thing */
-                frame = gspca_get_i_frame(gspca_dev);
-                if (frame && !discarding)
-                        gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
-                                        dev->jpeg_hdr, JPEG_HDR_SZ);
-                 else
-                        discarding = 1;
                 /*
                  * Now request data block 0. Line 0 reports the size
                  * to download, in blocks of size 0x200, and also tells the
@@ -222,14 +211,15 @@ static void jlj_dostream(struct work_struct *work)
                 size_in_blocks = buffer[0x0a];
                 blocks_left = buffer[0x0a] - 1;
                 PDEBUG(D_STREAM, "blocks_left = 0x%x", blocks_left);
-                packet_type = INTER_PACKET;
-                if (frame && !discarding)
-                        /* Toss line 0 of data block 0, keep the rest. */
-                        gspca_frame_add(gspca_dev, packet_type,
-                                frame, buffer + FRAME_HEADER_LEN,
+
+                /* Start a new frame, and add the JPEG header, first thing */
+                gspca_frame_add(gspca_dev, FIRST_PACKET,
+                                dev->jpeg_hdr, JPEG_HDR_SZ);
+                /* Toss line 0 of data block 0, keep the rest. */
+                gspca_frame_add(gspca_dev, INTER_PACKET,
+                                buffer + FRAME_HEADER_LEN,
                                 JEILINJ_MAX_TRANSFER - FRAME_HEADER_LEN);
-                        else
-                                discarding = 1;
+
                 while (blocks_left > 0) {
                         if (!gspca_dev->present)
                                 goto quit_stream;
@@ -246,12 +236,8 @@ static void jlj_dostream(struct work_struct *work)
                                 packet_type = LAST_PACKET;
                         else
                                 packet_type = INTER_PACKET;
-                        if (frame && !discarding)
-                                gspca_frame_add(gspca_dev, packet_type,
-                                                frame, buffer,
-                                                JEILINJ_MAX_TRANSFER);
-                        else
-                                discarding = 1;
+                        gspca_frame_add(gspca_dev, packet_type,
+                                        buffer, JEILINJ_MAX_TRANSFER);
                 }
         }
 quit_stream: