diff options
author | Johan Hovold <jhovold@gmail.com> | 2011-11-06 13:06:26 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-15 13:33:13 -0500 |
commit | 6d0f41abae30112b3cdca62c09370cc8801ee1f5 (patch) | |
tree | 94e76bf754557517d92b482efba99da7b3dc3a88 /drivers/usb/serial/mos7720.c | |
parent | 4556143cab73e013d0c3fa00f0f4f4373882399e (diff) |
USB: mos7720: remove incorrect read-urb check
Remove incorrect and unnecessary check for port->read_urb which is not
set to NULL, contrary to what seems to be assumed, when urb is killed.
Compile only-tested.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/mos7720.c')
-rw-r--r-- | drivers/usb/serial/mos7720.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 3524a105d04..b4f219ad2ea 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
@@ -939,11 +939,6 @@ 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; | 943 | port->read_urb->dev = port->serial->dev; |
949 | 944 | ||
@@ -1786,11 +1781,6 @@ static void mos7720_set_termios(struct tty_struct *tty, | |||
1786 | /* change the port settings to the new ones specified */ | 1781 | /* change the port settings to the new ones specified */ |
1787 | change_port_settings(tty, mos7720_port, old_termios); | 1782 | change_port_settings(tty, mos7720_port, old_termios); |
1788 | 1783 | ||
1789 | if (!port->read_urb) { | ||
1790 | dbg("%s", "URB KILLED !!!!!"); | ||
1791 | return; | ||
1792 | } | ||
1793 | |||
1794 | if (port->read_urb->status != -EINPROGRESS) { | 1784 | if (port->read_urb->status != -EINPROGRESS) { |
1795 | port->read_urb->dev = serial->dev; | 1785 | port->read_urb->dev = serial->dev; |
1796 | status = usb_submit_urb(port->read_urb, GFP_ATOMIC); | 1786 | status = usb_submit_urb(port->read_urb, GFP_ATOMIC); |