From: Greg Kroah-Hartman Date: Fri, 15 Jun 2007 22:44:13 +0000 (-0700) Subject: USB: serial: kl5kusb105: clean up urb->status usage X-Git-Tag: v2.6.23-rc1~1083^2~60 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=17c1b35a469b5e518b88cc509562ccfb44950145;p=linux-2.6-omap-h63xx.git USB: serial: kl5kusb105: clean up urb->status usage This done in anticipation of removal of urb->status, which will make that patch easier to review and apply in the future. Cc: Cc: Utz-Uwe Haus Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c index 7b085f334ce..5a4127e62c4 100644 --- a/drivers/usb/serial/kl5kusb105.c +++ b/drivers/usb/serial/kl5kusb105.c @@ -567,12 +567,13 @@ exit: static void klsi_105_write_bulk_callback ( struct urb *urb) { struct usb_serial_port *port = (struct usb_serial_port *)urb->context; + int status = urb->status; dbg("%s - port %d", __FUNCTION__, port->number); - - if (urb->status) { + + if (status) { dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, - urb->status); + status); return; } @@ -631,16 +632,17 @@ static void klsi_105_read_bulk_callback (struct urb *urb) struct tty_struct *tty; unsigned char *data = urb->transfer_buffer; int rc; + int status = urb->status; - dbg("%s - port %d", __FUNCTION__, port->number); + dbg("%s - port %d", __FUNCTION__, port->number); /* The urb might have been killed. */ - if (urb->status) { - dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, - urb->status); - return; - } - + if (status) { + dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, + status); + return; + } + /* The data received is again preceded by a length double-byte in LSB- * first order (see klsi_105_write() ) */