diff options
Diffstat (limited to 'drivers/usb/serial/omninet.c')
-rw-r--r-- | drivers/usb/serial/omninet.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index 00afc1712c39..ee94d9616d82 100644 --- a/drivers/usb/serial/omninet.c +++ b/drivers/usb/serial/omninet.c | |||
@@ -1,10 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * USB ZyXEL omni.net LCD PLUS driver | 2 | * USB ZyXEL omni.net LCD PLUS driver |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or |
5 | * it under the terms of the GNU General Public License as published by | 5 | * modify it under the terms of the GNU General Public License version |
6 | * the Free Software Foundation; either version 2 of the License, or | 6 | * 2 as published by the Free Software Foundation. |
7 | * (at your option) any later version. | ||
8 | * | 7 | * |
9 | * See Documentation/usb/usb-serial.txt for more information on using this driver | 8 | * See Documentation/usb/usb-serial.txt for more information on using this driver |
10 | * | 9 | * |
@@ -201,14 +200,15 @@ static void omninet_read_bulk_callback (struct urb *urb) | |||
201 | struct usb_serial_port *port = (struct usb_serial_port *)urb->context; | 200 | struct usb_serial_port *port = (struct usb_serial_port *)urb->context; |
202 | unsigned char *data = urb->transfer_buffer; | 201 | unsigned char *data = urb->transfer_buffer; |
203 | struct omninet_header *header = (struct omninet_header *) &data[0]; | 202 | struct omninet_header *header = (struct omninet_header *) &data[0]; |
204 | 203 | int status = urb->status; | |
205 | int i; | 204 | int i; |
206 | int result; | 205 | int result; |
207 | 206 | ||
208 | dbg("%s - port %d", __FUNCTION__, port->number); | 207 | dbg("%s - port %d", __FUNCTION__, port->number); |
209 | 208 | ||
210 | if (urb->status) { | 209 | if (status) { |
211 | dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, urb->status); | 210 | dbg("%s - nonzero read bulk status received: %d", |
211 | __FUNCTION__, status); | ||
212 | return; | 212 | return; |
213 | } | 213 | } |
214 | 214 | ||
@@ -312,12 +312,14 @@ static void omninet_write_bulk_callback (struct urb *urb) | |||
312 | { | 312 | { |
313 | /* struct omninet_header *header = (struct omninet_header *) urb->transfer_buffer; */ | 313 | /* struct omninet_header *header = (struct omninet_header *) urb->transfer_buffer; */ |
314 | 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; | ||
315 | 316 | ||
316 | dbg("%s - port %0x\n", __FUNCTION__, port->number); | 317 | dbg("%s - port %0x\n", __FUNCTION__, port->number); |
317 | 318 | ||
318 | port->write_urb_busy = 0; | 319 | port->write_urb_busy = 0; |
319 | if (urb->status) { | 320 | if (status) { |
320 | dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); | 321 | dbg("%s - nonzero write bulk status received: %d", |
322 | __FUNCTION__, status); | ||
321 | return; | 323 | return; |
322 | } | 324 | } |
323 | 325 | ||