From baebea6d2b9a9d0fd0be9ba383a09fc03efe7106 Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Thu, 26 Mar 2009 05:01:48 -0300 Subject: [PATCH] --- yaml --- r: 138323 b: refs/heads/master c: f6b8332b5e90a8d9c42f224e60900c7eae474388 h: refs/heads/master i: 138321: e5c8725d15d02f294e8380892af9b6bf9b8f8993 138319: 33c7975b857219e783f521455d899ca2d53e1445 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/sq905.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 06db109eb60c..318252dcbf1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eebb876b0b8f7ee5e6c01a85433a754c9be88369 +refs/heads/master: f6b8332b5e90a8d9c42f224e60900c7eae474388 diff --git a/trunk/drivers/media/video/gspca/sq905.c b/trunk/drivers/media/video/gspca/sq905.c index da60eea51e44..b1d377e495c2 100644 --- a/trunk/drivers/media/video/gspca/sq905.c +++ b/trunk/drivers/media/video/gspca/sq905.c @@ -270,13 +270,14 @@ static void sq905_dostream(struct work_struct *work) } frame = gspca_get_i_frame(gspca_dev); if (frame && !discarding) { - gspca_frame_add(gspca_dev, packet_type, + 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)) - gspca_frame_add(gspca_dev, LAST_PACKET, + if (packet_type == FIRST_PACKET && + bytes_left == 0) + frame = gspca_frame_add(gspca_dev, + LAST_PACKET, frame, data, 0); } else { discarding = 1;