---

yaml --- r: 138323 b: refs/heads/master c: f6b8332 h: refs/heads/master i: 138321: e5c8725 138319: 33c7975 v: v3
git-mirror · Mar 30, 2009 · baebea6 · baebea6
1 parent a5633a6
commit baebea6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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;