diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-06-15 15:44:13 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-12 16:34:31 -0700 |
| commit | 1373dbbca55503804ed191ba3914af68ce01e4bc (patch) | |
| tree | 626fb0e361a7f965487bae675074b0574cee95b5 /drivers/usb | |
| parent | 4d0dce3e0b794942407391c52f8dd2760802f391 (diff) | |
USB: serial: aircable: 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: <linux-usb-devel@lists.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/aircable.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c index fbc8c27d5d9..1cd29cd6bd0 100644 --- a/drivers/usb/serial/aircable.c +++ b/drivers/usb/serial/aircable.c @@ -411,12 +411,13 @@ static int aircable_write(struct usb_serial_port *port, static void aircable_write_bulk_callback(struct urb *urb) { struct usb_serial_port *port = urb->context; + int status = urb->status; int result; - dbg("%s - urb->status: %d", __FUNCTION__ , urb->status); + dbg("%s - urb status: %d", __FUNCTION__ , status); /* This has been taken from cypress_m8.c cypress_write_int_callback */ - switch (urb->status) { + switch (status) { case 0: /* success */ break; @@ -425,14 +426,14 @@ static void aircable_write_bulk_callback(struct urb *urb) case -ESHUTDOWN: /* this urb is terminated, clean up */ dbg("%s - urb shutting down with status: %d", - __FUNCTION__, urb->status); + __FUNCTION__, status); port->write_urb_busy = 0; return; default: /* error in the urb, so we have to resubmit it */ dbg("%s - Overflow in write", __FUNCTION__); dbg("%s - nonzero write bulk status received: %d", - __FUNCTION__, urb->status); + __FUNCTION__, status); port->write_urb->transfer_buffer_length = 1; port->write_urb->dev = port->serial->dev; result = usb_submit_urb(port->write_urb, GFP_ATOMIC); @@ -457,16 +458,17 @@ static void aircable_read_bulk_callback(struct urb *urb) unsigned long no_packages, remaining, package_length, i; int result, shift = 0; unsigned char *temp; + int status = urb->status; dbg("%s - port %d", __FUNCTION__, port->number); - if (urb->status) { - dbg("%s - urb->status = %d", __FUNCTION__, urb->status); + if (status) { + dbg("%s - urb status = %d", __FUNCTION__, status); if (!port->open_count) { dbg("%s - port is closed, exiting.", __FUNCTION__); return; } - if (urb->status == -EPROTO) { + if (status == -EPROTO) { dbg("%s - caught -EPROTO, resubmitting the urb", __FUNCTION__); usb_fill_bulk_urb(port->read_urb, port->serial->dev, |