aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-06-15 18:44:13 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-07-12 19:34:35 -0400
commitfdc2deb3892e802e916d1df7b1587aa0dbf3b271 (patch)
tree704ae76d5c57b519fc82e1fa8b458d9694eda1d4 /drivers/usb/serial
parent9965d612631c62c2018973080fa03396f49fce59 (diff)
USB: serial: omninet: 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/omninet.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 48094d125fff..ee94d9616d82 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -200,14 +200,15 @@ static void omninet_read_bulk_callback (struct urb *urb)
200 struct usb_serial_port *port = (struct usb_serial_port *)urb->context; 200 struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
201 unsigned char *data = urb->transfer_buffer; 201 unsigned char *data = urb->transfer_buffer;
202 struct omninet_header *header = (struct omninet_header *) &data[0]; 202 struct omninet_header *header = (struct omninet_header *) &data[0];
203 203 int status = urb->status;
204 int i; 204 int i;
205 int result; 205 int result;
206 206
207 dbg("%s - port %d", __FUNCTION__, port->number); 207 dbg("%s - port %d", __FUNCTION__, port->number);
208 208
209 if (urb->status) { 209 if (status) {
210 dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, urb->status); 210 dbg("%s - nonzero read bulk status received: %d",
211 __FUNCTION__, status);
211 return; 212 return;
212 } 213 }
213 214
@@ -311,12 +312,14 @@ static void omninet_write_bulk_callback (struct urb *urb)
311{ 312{
312/* struct omninet_header *header = (struct omninet_header *) urb->transfer_buffer; */ 313/* struct omninet_header *header = (struct omninet_header *) urb->transfer_buffer; */
313 struct usb_serial_port *port = (struct usb_serial_port *) urb->context; 314 struct usb_serial_port *port = (struct usb_serial_port *) urb->context;
315 int status = urb->status;
314 316
315 dbg("%s - port %0x\n", __FUNCTION__, port->number); 317 dbg("%s - port %0x\n", __FUNCTION__, port->number);
316 318
317 port->write_urb_busy = 0; 319 port->write_urb_busy = 0;
318 if (urb->status) { 320 if (status) {
319 dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); 321 dbg("%s - nonzero write bulk status received: %d",
322 __FUNCTION__, status);
320 return; 323 return;
321 } 324 }
322 325