From d6265dcb9b4efea9cf470067f2cf6f16b5c5faaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= Date: Sat, 25 Sep 2010 03:19:33 -0300 Subject: [PATCH] --- yaml --- r: 219211 b: refs/heads/master c: 8dbf3e7c3a89bb398d69e373962a6b447d1ff3d7 h: refs/heads/master i: 219209: dd980cc9cd718b32661fe8bf2e15317276785728 219207: b2b9eb5abca5a21b70dbe3af26dfbdfadc66ca1a v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/benq.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 47fa158b0532..f4ed90a17bc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57bee29d6e8cf721864fa47a18366bee5ff24f21 +refs/heads/master: 8dbf3e7c3a89bb398d69e373962a6b447d1ff3d7 diff --git a/trunk/drivers/media/video/gspca/benq.c b/trunk/drivers/media/video/gspca/benq.c index fce8d9492641..dc25788436c7 100644 --- a/trunk/drivers/media/video/gspca/benq.c +++ b/trunk/drivers/media/video/gspca/benq.c @@ -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; } } @@ -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; } @@ -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; @@ -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 */