From 3152b74f92048223263c54383b3639a2939d853a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 15 Jun 2007 15:44:13 -0700 Subject: USB: serial: ir-usb: 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: Gary Brubaker Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/ir-usb.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'drivers') diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c index 9d847f69291..8cec5e520d9 100644 --- a/drivers/usb/serial/ir-usb.c +++ b/drivers/usb/serial/ir-usb.c @@ -392,12 +392,14 @@ static int ir_write (struct usb_serial_port *port, const unsigned char *buf, int static void ir_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); port->write_urb_busy = 0; - if (urb->status) { - dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); + if (status) { + dbg("%s - nonzero write bulk status received: %d", + __FUNCTION__, status); return; } @@ -417,6 +419,7 @@ static void ir_read_bulk_callback (struct urb *urb) struct tty_struct *tty; unsigned char *data = urb->transfer_buffer; int result; + int status = urb->status; dbg("%s - port %d", __FUNCTION__, port->number); @@ -425,8 +428,7 @@ static void ir_read_bulk_callback (struct urb *urb) return; } - switch (urb->status) { - + switch (status) { case 0: /* Successful */ /* @@ -490,7 +492,7 @@ static void ir_read_bulk_callback (struct urb *urb) default: dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, - urb->status); + status); break ; } -- cgit v1.2.3-70-g09d2