diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-06-15 18:44:13 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-12 19:34:33 -0400 |
commit | fbd272254b034e22a5157af51c8c5907a8f69614 (patch) | |
tree | 1252ee792922feb8988a54e2209fdf6dac5cae4f /drivers/usb/serial | |
parent | f9feb517faf03ee85de6e2467f7fcb87c1af2258 (diff) |
USB: serial: generic: 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/serial')
-rw-r--r-- | drivers/usb/serial/generic.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index b09bed4b77d3..88a2c7dce335 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c | |||
@@ -325,11 +325,13 @@ void usb_serial_generic_read_bulk_callback (struct urb *urb) | |||
325 | { | 325 | { |
326 | struct usb_serial_port *port = (struct usb_serial_port *)urb->context; | 326 | struct usb_serial_port *port = (struct usb_serial_port *)urb->context; |
327 | unsigned char *data = urb->transfer_buffer; | 327 | unsigned char *data = urb->transfer_buffer; |
328 | int status = urb->status; | ||
328 | 329 | ||
329 | dbg("%s - port %d", __FUNCTION__, port->number); | 330 | dbg("%s - port %d", __FUNCTION__, port->number); |
330 | 331 | ||
331 | if (unlikely(urb->status != 0)) { | 332 | if (unlikely(status != 0)) { |
332 | dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, urb->status); | 333 | dbg("%s - nonzero read bulk status received: %d", |
334 | __FUNCTION__, status); | ||
333 | return; | 335 | return; |
334 | } | 336 | } |
335 | 337 | ||
@@ -347,12 +349,14 @@ EXPORT_SYMBOL_GPL(usb_serial_generic_read_bulk_callback); | |||
347 | void usb_serial_generic_write_bulk_callback (struct urb *urb) | 349 | void usb_serial_generic_write_bulk_callback (struct urb *urb) |
348 | { | 350 | { |
349 | struct usb_serial_port *port = (struct usb_serial_port *)urb->context; | 351 | struct usb_serial_port *port = (struct usb_serial_port *)urb->context; |
352 | int status = urb->status; | ||
350 | 353 | ||
351 | dbg("%s - port %d", __FUNCTION__, port->number); | 354 | dbg("%s - port %d", __FUNCTION__, port->number); |
352 | 355 | ||
353 | port->write_urb_busy = 0; | 356 | port->write_urb_busy = 0; |
354 | if (urb->status) { | 357 | if (status) { |
355 | dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); | 358 | dbg("%s - nonzero write bulk status received: %d", |
359 | __FUNCTION__, status); | ||
356 | return; | 360 | return; |
357 | } | 361 | } |
358 | 362 | ||