diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2009-11-13 09:21:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 18:41:59 -0200 |
| commit | 76dd272b56cd1c7fa013ef5d7eb28c4d319e322b (patch) | |
| tree | 4cd4660a847d2c1fdd9104ce4cff92b647e09b15 /drivers/media/video/gspca/sq905.c | |
| parent | d131c3c9e136cb5a817094c3dc4b7261b495cd6e (diff) | |
| download | kernel_samsung_smdk4412-76dd272b56cd1c7fa013ef5d7eb28c4d319e322b.zip kernel_samsung_smdk4412-76dd272b56cd1c7fa013ef5d7eb28c4d319e322b.tar.gz kernel_samsung_smdk4412-76dd272b56cd1c7fa013ef5d7eb28c4d319e322b.tar.bz2 | |
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/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 547d1fd..1fcaca6 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) { struct sd *dev = container_of(work, struct sd, work_struct); struct gspca_dev *gspca_dev = &dev->gspca_dev; - struct gspca_frame *frame; int bytes_left; /* bytes remaining in current frame. */ int data_len; /* size to use for the next read. */ int header_read; /* true if we have already read the frame header. */ @@ -266,18 +265,14 @@ static void sq905_dostream(struct work_struct *work) } else { packet_type = INTER_PACKET; } - frame = gspca_get_i_frame(gspca_dev); - if (frame) { - frame = gspca_frame_add(gspca_dev, packet_type, - frame, data, data_len); - /* If entire frame fits in one packet we still - need to add a LAST_PACKET */ - if (packet_type == FIRST_PACKET && - bytes_left == 0) - frame = gspca_frame_add(gspca_dev, - LAST_PACKET, - frame, data, 0); - } + gspca_frame_add(gspca_dev, packet_type, + data, data_len); + /* If entire frame fits in one packet we still + need to add a LAST_PACKET */ + if (packet_type == FIRST_PACKET && + bytes_left == 0) + gspca_frame_add(gspca_dev, LAST_PACKET, + NULL, 0); } if (gspca_dev->present) { /* acknowledge the frame */ |