diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2009-11-13 07:21:03 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 15:41:59 -0500 |
commit | 76dd272b56cd1c7fa013ef5d7eb28c4d319e322b (patch) | |
tree | 4cd4660a847d2c1fdd9104ce4cff92b647e09b15 /drivers/media/video/gspca/jeilinj.c | |
parent | d131c3c9e136cb5a817094c3dc4b7261b495cd6e (diff) |
V4L/DVB (13453): gspca - all subdrivers: Remove the unused frame ptr from pkt_scan().
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/jeilinj.c')
-rw-r--r-- | drivers/media/video/gspca/jeilinj.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/drivers/media/video/gspca/jeilinj.c b/drivers/media/video/gspca/jeilinj.c index d679970d5b3e..2019b04f9235 100644 --- a/drivers/media/video/gspca/jeilinj.c +++ b/drivers/media/video/gspca/jeilinj.c | |||
@@ -181,7 +181,6 @@ static void jlj_dostream(struct work_struct *work) | |||
181 | { | 181 | { |
182 | struct sd *dev = container_of(work, struct sd, work_struct); | 182 | struct sd *dev = container_of(work, struct sd, work_struct); |
183 | struct gspca_dev *gspca_dev = &dev->gspca_dev; | 183 | struct gspca_dev *gspca_dev = &dev->gspca_dev; |
184 | struct gspca_frame *frame; | ||
185 | int blocks_left; /* 0x200-sized blocks remaining in current frame. */ | 184 | int blocks_left; /* 0x200-sized blocks remaining in current frame. */ |
186 | int size_in_blocks; | 185 | int size_in_blocks; |
187 | int act_len; | 186 | int act_len; |
@@ -214,15 +213,13 @@ static void jlj_dostream(struct work_struct *work) | |||
214 | PDEBUG(D_STREAM, "blocks_left = 0x%x", blocks_left); | 213 | PDEBUG(D_STREAM, "blocks_left = 0x%x", blocks_left); |
215 | 214 | ||
216 | /* Start a new frame, and add the JPEG header, first thing */ | 215 | /* Start a new frame, and add the JPEG header, first thing */ |
217 | frame = gspca_get_i_frame(gspca_dev); | 216 | gspca_frame_add(gspca_dev, FIRST_PACKET, |
218 | if (frame) { | 217 | dev->jpeg_hdr, JPEG_HDR_SZ); |
219 | gspca_frame_add(gspca_dev, FIRST_PACKET, frame, | 218 | /* Toss line 0 of data block 0, keep the rest. */ |
220 | dev->jpeg_hdr, JPEG_HDR_SZ); | 219 | gspca_frame_add(gspca_dev, INTER_PACKET, |
221 | /* Toss line 0 of data block 0, keep the rest. */ | 220 | buffer + FRAME_HEADER_LEN, |
222 | gspca_frame_add(gspca_dev, INTER_PACKET, | ||
223 | frame, buffer + FRAME_HEADER_LEN, | ||
224 | JEILINJ_MAX_TRANSFER - FRAME_HEADER_LEN); | 221 | JEILINJ_MAX_TRANSFER - FRAME_HEADER_LEN); |
225 | } | 222 | |
226 | while (blocks_left > 0) { | 223 | while (blocks_left > 0) { |
227 | if (!gspca_dev->present) | 224 | if (!gspca_dev->present) |
228 | goto quit_stream; | 225 | goto quit_stream; |
@@ -239,10 +236,8 @@ static void jlj_dostream(struct work_struct *work) | |||
239 | packet_type = LAST_PACKET; | 236 | packet_type = LAST_PACKET; |
240 | else | 237 | else |
241 | packet_type = INTER_PACKET; | 238 | packet_type = INTER_PACKET; |
242 | if (frame) | 239 | gspca_frame_add(gspca_dev, packet_type, |
243 | gspca_frame_add(gspca_dev, packet_type, | 240 | buffer, JEILINJ_MAX_TRANSFER); |
244 | frame, buffer, | ||
245 | JEILINJ_MAX_TRANSFER); | ||
246 | } | 241 | } |
247 | } | 242 | } |
248 | quit_stream: | 243 | quit_stream: |