diff options
| author | Jean-François Moine <moinejf@free.fr> | 2010-06-27 03:08:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 15:31:10 -0300 |
| commit | b192ca983746585e807259414f8d6f58cb28311f (patch) | |
| tree | 8c95bdcebcf4217e3813d803ecf281af2d431e5f /drivers/media/video/gspca/ov519.c | |
| parent | c6dc725c8e0c3438587e18f918f6da16e7a23539 (diff) | |
| download | talos-op-linux-b192ca983746585e807259414f8d6f58cb28311f.tar.gz talos-op-linux-b192ca983746585e807259414f8d6f58cb28311f.zip | |
V4L/DVB: gspca - main: Simplify image building
The image pointer and its length are now in the main structure instead
of in the frame buffer. They are updated on application vidioc_qbuf and
in the URB interrupt function when ending an image.
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/ov519.c')
| -rw-r--r-- | drivers/media/video/gspca/ov519.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c index 2e7df66a84b9..2b2cbdbf03fe 100644 --- a/drivers/media/video/gspca/ov519.c +++ b/drivers/media/video/gspca/ov519.c @@ -4162,7 +4162,6 @@ static void ovfx2_pkt_scan(struct gspca_dev *gspca_dev, int len) /* iso packet length */ { struct sd *sd = (struct sd *) gspca_dev; - struct gspca_frame *frame; gspca_frame_add(gspca_dev, INTER_PACKET, data, len); @@ -4172,9 +4171,8 @@ static void ovfx2_pkt_scan(struct gspca_dev *gspca_dev, the sensor and bridge are still syncing, so drop it. */ if (sd->first_frame) { sd->first_frame--; - frame = gspca_get_i_frame(gspca_dev); - if (!frame || (frame->data_end - frame->data) < - (sd->gspca_dev.width * sd->gspca_dev.height)) + if (gspca_dev->image_len < + sd->gspca_dev.width * sd->gspca_dev.height) gspca_dev->last_packet_type = DISCARD_PACKET; } gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0); |
