diff options
Diffstat (limited to 'drivers/media/video/gspca/sq905.c')
-rw-r--r-- | drivers/media/video/gspca/sq905.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c index 547d1fd5191d..1fcaca6a87f7 100644 --- a/drivers/media/video/gspca/sq905.c +++ b/drivers/media/video/gspca/sq905.c | |||
@@ -214,7 +214,6 @@ static void sq905_dostream(struct work_struct *work) | |||
214 | { | 214 | { |
215 | struct sd *dev = container_of(work, struct sd, work_struct); | 215 | struct sd *dev = container_of(work, struct sd, work_struct); |
216 | struct gspca_dev *gspca_dev = &dev->gspca_dev; | 216 | struct gspca_dev *gspca_dev = &dev->gspca_dev; |
217 | struct gspca_frame *frame; | ||
218 | int bytes_left; /* bytes remaining in current frame. */ | 217 | int bytes_left; /* bytes remaining in current frame. */ |
219 | int data_len; /* size to use for the next read. */ | 218 | int data_len; /* size to use for the next read. */ |
220 | int header_read; /* true if we have already read the frame header. */ | 219 | int header_read; /* true if we have already read the frame header. */ |
@@ -266,18 +265,14 @@ static void sq905_dostream(struct work_struct *work) | |||
266 | } else { | 265 | } else { |
267 | packet_type = INTER_PACKET; | 266 | packet_type = INTER_PACKET; |
268 | } | 267 | } |
269 | frame = gspca_get_i_frame(gspca_dev); | 268 | gspca_frame_add(gspca_dev, packet_type, |
270 | if (frame) { | 269 | data, data_len); |
271 | frame = gspca_frame_add(gspca_dev, packet_type, | 270 | /* If entire frame fits in one packet we still |
272 | frame, data, data_len); | 271 | need to add a LAST_PACKET */ |
273 | /* If entire frame fits in one packet we still | 272 | if (packet_type == FIRST_PACKET && |
274 | need to add a LAST_PACKET */ | 273 | bytes_left == 0) |
275 | if (packet_type == FIRST_PACKET && | 274 | gspca_frame_add(gspca_dev, LAST_PACKET, |
276 | bytes_left == 0) | 275 | NULL, 0); |
277 | frame = gspca_frame_add(gspca_dev, | ||
278 | LAST_PACKET, | ||
279 | frame, data, 0); | ||
280 | } | ||
281 | } | 276 | } |
282 | if (gspca_dev->present) { | 277 | if (gspca_dev->present) { |
283 | /* acknowledge the frame */ | 278 | /* acknowledge the frame */ |