diff options
Diffstat (limited to 'drivers/usb/serial/mos7720.c')
| -rw-r--r-- | drivers/usb/serial/mos7720.c | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index b563e2ad872..231b584f6d0 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c @@ -9,9 +9,9 @@ * the Free Software Foundation, version 2 of the License. * * Developed by: - * VijayaKumar.G.N. <vijaykumar@aspirecom.net> - * AjayKumar <ajay@aspirecom.net> - * Gurudeva.N. <gurudev@aspirecom.net> + * Vijaya Kumar <vijaykumar.gn@gmail.com> + * Ajay Kumar <naanuajay@yahoo.com> + * Gurudeva <ngurudeva@yahoo.com> * * Cleaned up from the original by: * Greg Kroah-Hartman <gregkh@suse.de> @@ -103,6 +103,7 @@ static void mos7720_interrupt_callback(struct urb *urb) { int result; int length; + int status = urb->status; __u8 *data; __u8 sp1; __u8 sp2; @@ -114,7 +115,7 @@ static void mos7720_interrupt_callback(struct urb *urb) return; } - switch (urb->status) { + switch (status) { case 0: /* success */ break; @@ -123,11 +124,11 @@ static void mos7720_interrupt_callback(struct urb *urb) case -ESHUTDOWN: /* this urb is terminated, clean up */ dbg("%s - urb shutting down with status: %d", __FUNCTION__, - urb->status); + status); return; default: dbg("%s - nonzero urb status received: %d", __FUNCTION__, - urb->status); + status); goto exit; } @@ -198,14 +199,15 @@ exit: */ static void mos7720_bulk_in_callback(struct urb *urb) { - int status; + int retval; unsigned char *data ; struct usb_serial_port *port; struct moschip_port *mos7720_port; struct tty_struct *tty; + int status = urb->status; - if (urb->status) { - dbg("nonzero read bulk status received: %d",urb->status); + if (status) { + dbg("nonzero read bulk status received: %d", status); return; } @@ -236,10 +238,10 @@ static void mos7720_bulk_in_callback(struct urb *urb) if (port->read_urb->status != -EINPROGRESS) { port->read_urb->dev = port->serial->dev; - status = usb_submit_urb(port->read_urb, GFP_ATOMIC); - if (status) - dbg("usb_submit_urb(read bulk) failed, status = %d", - status); + retval = usb_submit_urb(port->read_urb, GFP_ATOMIC); + if (retval) + dbg("usb_submit_urb(read bulk) failed, retval = %d", + retval); } } @@ -252,9 +254,10 @@ static void mos7720_bulk_out_data_callback(struct urb *urb) { struct moschip_port *mos7720_port; struct tty_struct *tty; + int status = urb->status; - if (urb->status) { - dbg("nonzero write bulk status received:%d", urb->status); + if (status) { + dbg("nonzero write bulk status received:%d", status); return; } @@ -1235,16 +1238,6 @@ static void mos7720_set_termios(struct usb_serial_port *port, return; } - /* check that they really want us to change something */ - if (old_termios) { - if ((cflag == old_termios->c_cflag) && - (RELEVANT_IFLAG(tty->termios->c_iflag) == - RELEVANT_IFLAG(old_termios->c_iflag))) { - dbg("Nothing to change"); - return; - } - } - dbg("%s - clfag %08x iflag %08x", __FUNCTION__, tty->termios->c_cflag, RELEVANT_IFLAG(tty->termios->c_iflag)); |