summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2011-11-06 19:06:26 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-15 19:33:13 +0100
commit6d0f41abae30112b3cdca62c09370cc8801ee1f5 (patch)
tree94e76bf754557517d92b482efba99da7b3dc3a88
parentUSB: serial: remove write_urb_busy field from usb_serial_port (diff)
downloadlinux-6d0f41abae30112b3cdca62c09370cc8801ee1f5.tar.xz
linux-6d0f41abae30112b3cdca62c09370cc8801ee1f5.zip
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>
-rw-r--r--drivers/usb/serial/mos7720.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 3524a105d042..b4f219ad2ea2 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)
}
tty_kref_put(tty);
- if (!port->read_urb) {
- dbg("URB KILLED !!!");
- return;
- }
-
if (port->read_urb->status != -EINPROGRESS) {
port->read_urb->dev = port->serial->dev;
@@ -1786,11 +1781,6 @@ static void mos7720_set_termios(struct tty_struct *tty,
/* change the port settings to the new ones specified */
change_port_settings(tty, mos7720_port, old_termios);
- if (!port->read_urb) {
- dbg("%s", "URB KILLED !!!!!");
- return;
- }
-
if (port->read_urb->status != -EINPROGRESS) {
port->read_urb->dev = serial->dev;
status = usb_submit_urb(port->read_urb, GFP_ATOMIC);