diff options
Diffstat (limited to 'drivers/media/video/gspca/cpia1.c')
-rw-r--r-- | drivers/media/video/gspca/cpia1.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c index 58b696f455be..3747a1dcff54 100644 --- a/drivers/media/video/gspca/cpia1.c +++ b/drivers/media/video/gspca/cpia1.c | |||
@@ -1760,22 +1760,19 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, | |||
1760 | data[25] == sd->params.roi.colEnd && | 1760 | data[25] == sd->params.roi.colEnd && |
1761 | data[26] == sd->params.roi.rowStart && | 1761 | data[26] == sd->params.roi.rowStart && |
1762 | data[27] == sd->params.roi.rowEnd) { | 1762 | data[27] == sd->params.roi.rowEnd) { |
1763 | struct gspca_frame *frame = gspca_get_i_frame(gspca_dev); | 1763 | u8 *image; |
1764 | 1764 | ||
1765 | atomic_set(&sd->cam_exposure, data[39] * 2); | 1765 | atomic_set(&sd->cam_exposure, data[39] * 2); |
1766 | atomic_set(&sd->fps, data[41]); | 1766 | atomic_set(&sd->fps, data[41]); |
1767 | 1767 | ||
1768 | if (frame == NULL) { | ||
1769 | gspca_dev->last_packet_type = DISCARD_PACKET; | ||
1770 | return; | ||
1771 | } | ||
1772 | |||
1773 | /* Check for proper EOF for last frame */ | 1768 | /* Check for proper EOF for last frame */ |
1774 | if ((frame->data_end - frame->data) > 4 && | 1769 | image = gspca_dev->image; |
1775 | frame->data_end[-4] == 0xff && | 1770 | if (image != NULL && |
1776 | frame->data_end[-3] == 0xff && | 1771 | gspca_dev->image_len > 4 && |
1777 | frame->data_end[-2] == 0xff && | 1772 | image[gspca_dev->image_len - 4] == 0xff && |
1778 | frame->data_end[-1] == 0xff) | 1773 | image[gspca_dev->image_len - 3] == 0xff && |
1774 | image[gspca_dev->image_len - 2] == 0xff && | ||
1775 | image[gspca_dev->image_len - 1] == 0xff) | ||
1779 | gspca_frame_add(gspca_dev, LAST_PACKET, | 1776 | gspca_frame_add(gspca_dev, LAST_PACKET, |
1780 | NULL, 0); | 1777 | NULL, 0); |
1781 | 1778 | ||