diff options
Diffstat (limited to 'drivers/usb/serial/mos7720.c')
-rw-r--r-- | drivers/usb/serial/mos7720.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 3524a105d042..19d112f51b97 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
@@ -939,14 +939,7 @@ static void mos7720_bulk_in_callback(struct urb *urb) | |||
939 | } | 939 | } |
940 | tty_kref_put(tty); | 940 | tty_kref_put(tty); |
941 | 941 | ||
942 | if (!port->read_urb) { | ||
943 | dbg("URB KILLED !!!"); | ||
944 | return; | ||
945 | } | ||
946 | |||
947 | if (port->read_urb->status != -EINPROGRESS) { | 942 | if (port->read_urb->status != -EINPROGRESS) { |
948 | port->read_urb->dev = port->serial->dev; | ||
949 | |||
950 | retval = usb_submit_urb(port->read_urb, GFP_ATOMIC); | 943 | retval = usb_submit_urb(port->read_urb, GFP_ATOMIC); |
951 | if (retval) | 944 | if (retval) |
952 | dbg("usb_submit_urb(read bulk) failed, retval = %d", | 945 | dbg("usb_submit_urb(read bulk) failed, retval = %d", |
@@ -1014,7 +1007,6 @@ static int mos77xx_calc_num_ports(struct usb_serial *serial) | |||
1014 | static int mos7720_open(struct tty_struct *tty, struct usb_serial_port *port) | 1007 | static int mos7720_open(struct tty_struct *tty, struct usb_serial_port *port) |
1015 | { | 1008 | { |
1016 | struct usb_serial *serial; | 1009 | struct usb_serial *serial; |
1017 | struct usb_serial_port *port0; | ||
1018 | struct urb *urb; | 1010 | struct urb *urb; |
1019 | struct moschip_port *mos7720_port; | 1011 | struct moschip_port *mos7720_port; |
1020 | int response; | 1012 | int response; |
@@ -1029,8 +1021,6 @@ static int mos7720_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
1029 | if (mos7720_port == NULL) | 1021 | if (mos7720_port == NULL) |
1030 | return -ENODEV; | 1022 | return -ENODEV; |
1031 | 1023 | ||
1032 | port0 = serial->port[0]; | ||
1033 | |||
1034 | usb_clear_halt(serial->dev, port->write_urb->pipe); | 1024 | usb_clear_halt(serial->dev, port->write_urb->pipe); |
1035 | usb_clear_halt(serial->dev, port->read_urb->pipe); | 1025 | usb_clear_halt(serial->dev, port->read_urb->pipe); |
1036 | 1026 | ||
@@ -1735,8 +1725,6 @@ static void change_port_settings(struct tty_struct *tty, | |||
1735 | write_mos_reg(serial, port_number, IER, 0x0c); | 1725 | write_mos_reg(serial, port_number, IER, 0x0c); |
1736 | 1726 | ||
1737 | if (port->read_urb->status != -EINPROGRESS) { | 1727 | if (port->read_urb->status != -EINPROGRESS) { |
1738 | port->read_urb->dev = serial->dev; | ||
1739 | |||
1740 | status = usb_submit_urb(port->read_urb, GFP_ATOMIC); | 1728 | status = usb_submit_urb(port->read_urb, GFP_ATOMIC); |
1741 | if (status) | 1729 | if (status) |
1742 | dbg("usb_submit_urb(read bulk) failed, status = %d", | 1730 | dbg("usb_submit_urb(read bulk) failed, status = %d", |
@@ -1786,13 +1774,7 @@ static void mos7720_set_termios(struct tty_struct *tty, | |||
1786 | /* change the port settings to the new ones specified */ | 1774 | /* change the port settings to the new ones specified */ |
1787 | change_port_settings(tty, mos7720_port, old_termios); | 1775 | change_port_settings(tty, mos7720_port, old_termios); |
1788 | 1776 | ||
1789 | if (!port->read_urb) { | ||
1790 | dbg("%s", "URB KILLED !!!!!"); | ||
1791 | return; | ||
1792 | } | ||
1793 | |||
1794 | if (port->read_urb->status != -EINPROGRESS) { | 1777 | if (port->read_urb->status != -EINPROGRESS) { |
1795 | port->read_urb->dev = serial->dev; | ||
1796 | status = usb_submit_urb(port->read_urb, GFP_ATOMIC); | 1778 | status = usb_submit_urb(port->read_urb, GFP_ATOMIC); |
1797 | if (status) | 1779 | if (status) |
1798 | dbg("usb_submit_urb(read bulk) failed, status = %d", | 1780 | dbg("usb_submit_urb(read bulk) failed, status = %d", |