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:32 -0700 |
| commit | 0fb0aa188d0e61d58485288071e73d3766513f2a (patch) | |
| tree | 74ab866d57dc0636da5240cb1c3865b3afd3fdac /drivers/usb/serial/ftdi_sio.c | |
| parent | 335202f44a9a68902a80e09ba33aa4eaddc9c8ed (diff) | |
USB: serial: ftdi_sio: 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>
Cc: Kuba Ober <kuba@mareimbrium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 3edd13f0098..4066a468118 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1576,14 +1576,15 @@ static void ftdi_write_bulk_callback (struct urb *urb) struct ftdi_private *priv; int data_offset; /* will be 1 for the SIO and 0 otherwise */ unsigned long countback; + int status = urb->status; /* free up the transfer buffer, as usb_free_urb() does not do this */ kfree (urb->transfer_buffer); dbg("%s - port %d", __FUNCTION__, port->number); - if (urb->status) { - dbg("nonzero write bulk status received: %d", urb->status); + if (status) { + dbg("nonzero write bulk status received: %d", status); return; } @@ -1659,6 +1660,7 @@ static void ftdi_read_bulk_callback (struct urb *urb) struct ftdi_private *priv; unsigned long countread; unsigned long flags; + int status = urb->status; if (urb->number_of_packets > 0) { err("%s transfer_buffer_length %d actual_length %d number of packets %d",__FUNCTION__, @@ -1687,9 +1689,10 @@ static void ftdi_read_bulk_callback (struct urb *urb) err("%s - Not my urb!", __FUNCTION__); } - if (urb->status) { + if (status) { /* This will happen at close every time so it is a dbg not an err */ - dbg("(this is ok on close) nonzero read bulk status received: %d", urb->status); + dbg("(this is ok on close) nonzero read bulk status received: " + "%d", status); return; } |