From: Greg Kroah-Hartman Date: Fri, 15 Jun 2007 22:44:13 +0000 (-0700) Subject: USB: serial: ftdi_sio: clean up urb->status usage X-Git-Tag: v2.6.23-rc1~1083^2~70 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fb0aa188d0e61d58485288071e73d3766513f2a;p=linux-2.6 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: Cc: Kuba Ober Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 3edd13f009..4066a46811 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; }