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 | b4a1579772667f9ebc0c9e26ed0b674966085e85 (patch) | |
tree | 5d8fd1de2fd8d030af9b107cf69799a548ea8a45 /drivers/usb | |
parent | 2362deb5782d9861a0dade72e2e29114652c69a3 (diff) |
USB: serial: ipw: 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: Roelf Diedericks <roelfd@inet.co.za>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/serial/ipw.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c index 1bc586064c77..1b94daa61584 100644 --- a/drivers/usb/serial/ipw.c +++ b/drivers/usb/serial/ipw.c | |||
@@ -167,11 +167,13 @@ static void ipw_read_bulk_callback(struct urb *urb) | |||
167 | unsigned char *data = urb->transfer_buffer; | 167 | unsigned char *data = urb->transfer_buffer; |
168 | struct tty_struct *tty; | 168 | struct tty_struct *tty; |
169 | int result; | 169 | int result; |
170 | int status = urb->status; | ||
170 | 171 | ||
171 | dbg("%s - port %d", __FUNCTION__, port->number); | 172 | dbg("%s - port %d", __FUNCTION__, port->number); |
172 | 173 | ||
173 | if (urb->status) { | 174 | if (status) { |
174 | dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, urb->status); | 175 | dbg("%s - nonzero read bulk status received: %d", |
176 | __FUNCTION__, status); | ||
175 | return; | 177 | return; |
176 | } | 178 | } |
177 | 179 | ||
@@ -369,13 +371,15 @@ static void ipw_close(struct usb_serial_port *port, struct file * filp) | |||
369 | static void ipw_write_bulk_callback(struct urb *urb) | 371 | static void ipw_write_bulk_callback(struct urb *urb) |
370 | { | 372 | { |
371 | struct usb_serial_port *port = urb->context; | 373 | struct usb_serial_port *port = urb->context; |
374 | int status = urb->status; | ||
372 | 375 | ||
373 | dbg("%s", __FUNCTION__); | 376 | dbg("%s", __FUNCTION__); |
374 | 377 | ||
375 | port->write_urb_busy = 0; | 378 | port->write_urb_busy = 0; |
376 | 379 | ||
377 | if (urb->status) | 380 | if (status) |
378 | dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); | 381 | dbg("%s - nonzero write bulk status received: %d", |
382 | __FUNCTION__, status); | ||
379 | 383 | ||
380 | usb_serial_port_softint(port); | 384 | usb_serial_port_softint(port); |
381 | } | 385 | } |