Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 114041
b: refs/heads/master
c: 1b33459
h: refs/heads/master
i:
  114039: b131bf6
v: v3
  • Loading branch information
Erik Andren authored and Mauro Carvalho Chehab committed Oct 12, 2008
1 parent ad1930e commit 2c36d68
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e293e599524f74532b0add53ddf80f10ff854598
refs/heads/master: 1b3345996c056a979cfabf96c0815b4843d9bbfc
10 changes: 6 additions & 4 deletions trunk/drivers/media/video/gspca/m5602/m5602_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ int m5602_probe_sensor(struct sd *sd)
return 0;
}


/* More sensor probe function goes here */
info("Failed to find a sensor");
sd->sensor = NULL;
Expand Down Expand Up @@ -202,12 +203,13 @@ void m5602_urb_complete(struct gspca_dev *gspca_dev, struct gspca_frame *frame,
/* Complete the last frame (if any) */
frame = gspca_frame_add(gspca_dev, LAST_PACKET,
frame, data, 0);
sd->frame_count++;

/* Create a new frame */
gspca_frame_add(gspca_dev, FIRST_PACKET, frame, data, len);

PDEBUG(DBG_V4L2, "Starting new frame. First urb contained %d",
len);
PDEBUG(DBG_V4L2, "Starting new frame %d",
sd->frame_count);

} else {
int cur_frame_len = frame->data_end - frame->data;
Expand All @@ -217,8 +219,8 @@ void m5602_urb_complete(struct gspca_dev *gspca_dev, struct gspca_frame *frame,
len -= 4;

if (cur_frame_len + len <= frame->v4l2_buf.length) {
PDEBUG(DBG_DATA, "Continuing frame copying %d bytes",
len);
PDEBUG(DBG_DATA, "Continuing frame %d copying %d bytes",
sd->frame_count, len);

gspca_frame_add(gspca_dev, INTER_PACKET, frame,
data, len);
Expand Down

0 comments on commit 2c36d68

Please sign in to comment.