Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219211
b: refs/heads/master
c: 8dbf3e7
h: refs/heads/master
i:
  219209: dd980cc
  219207: b2b9eb5
v: v3
  • Loading branch information
Jean-François Moine authored and Mauro Carvalho Chehab committed Oct 21, 2010
1 parent 6747b0d commit d6265dc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 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: 57bee29d6e8cf721864fa47a18366bee5ff24f21
refs/heads/master: 8dbf3e7c3a89bb398d69e373962a6b447d1ff3d7
11 changes: 5 additions & 6 deletions trunk/drivers/media/video/gspca/benq.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static void reg_w(struct gspca_dev *gspca_dev,
0,
500);
if (ret < 0) {
PDEBUG(D_ERR, "reg_w err %d", ret);
err("reg_w err %d", ret);
gspca_dev->usb_err = ret;
}
}
Expand Down Expand Up @@ -180,7 +180,7 @@ static void sd_isoc_irq(struct urb *urb)
if (gspca_dev->frozen)
return;
#endif
PDEBUG(D_ERR|D_PACK, "urb status: %d", urb->status);
err("urb status: %d", urb->status);
return;
}

Expand Down Expand Up @@ -208,8 +208,7 @@ static void sd_isoc_irq(struct urb *urb)
if (st == 0)
st = urb->iso_frame_desc[i].status;
if (st) {
PDEBUG(D_ERR,
"ISOC data error: [%d] status=%d",
err("ISOC data error: [%d] status=%d",
i, st);
gspca_dev->last_packet_type = DISCARD_PACKET;
continue;
Expand Down Expand Up @@ -256,10 +255,10 @@ static void sd_isoc_irq(struct urb *urb)
/* resubmit the URBs */
st = usb_submit_urb(urb0, GFP_ATOMIC);
if (st < 0)
PDEBUG(D_ERR|D_PACK, "usb_submit_urb(0) ret %d", st);
err("usb_submit_urb(0) ret %d", st);
st = usb_submit_urb(urb, GFP_ATOMIC);
if (st < 0)
PDEBUG(D_ERR|D_PACK, "usb_submit_urb() ret %d", st);
err("usb_submit_urb() ret %d", st);
}

/* sub-driver description */
Expand Down

0 comments on commit d6265dc

Please sign in to comment.