From a9b57a3641bfdafdceaa2261bc267117c89cf82a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 15 May 2012 16:27:25 -0700 Subject: [PATCH] --- yaml --- r: 303958 b: refs/heads/master c: 00c533fd64a3eb7f8e266413d3e9bd070df9d5ed h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/navman.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b15369e59f01..37c6efd889c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f857ae922a08a94fe41a649c2d0baa73cd74d2a +refs/heads/master: 00c533fd64a3eb7f8e266413d3e9bd070df9d5ed diff --git a/trunk/drivers/usb/serial/navman.c b/trunk/drivers/usb/serial/navman.c index 7a09e8a07907..d95452cc076d 100644 --- a/trunk/drivers/usb/serial/navman.c +++ b/trunk/drivers/usb/serial/navman.c @@ -46,12 +46,12 @@ static void navman_read_int_callback(struct urb *urb) case -ENOENT: case -ESHUTDOWN: /* this urb is terminated, clean up */ - dbg("%s - urb shutting down with status: %d", - __func__, status); + dev_dbg(&port->dev, "%s - urb shutting down with status: %d\n", + __func__, status); return; default: - dbg("%s - nonzero urb status received: %d", - __func__, status); + dev_dbg(&port->dev, "%s - nonzero urb status received: %d\n", + __func__, status); goto exit; } @@ -78,7 +78,8 @@ static int navman_open(struct tty_struct *tty, struct usb_serial_port *port) int result = 0; if (port->interrupt_in_urb) { - dbg("%s - adding interrupt input for treo", __func__); + dev_dbg(&port->dev, "%s - adding interrupt input for treo\n", + __func__); result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); if (result) dev_err(&port->dev,