diff options
author | Johan Hovold <jhovold@gmail.com> | 2013-03-21 07:36:31 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 16:44:17 -0400 |
commit | 853127faa43f4971c4e9fc506bb86622208ca935 (patch) | |
tree | 3895347a8f51ad1ecb5825ffb877abb80849e8ec | |
parent | 28e679ae6fd67023d5e8e61a0092791c5082c21c (diff) |
USB: iuu_phoenix: remove bogus disconnect test in close
Remove bogus (and unnecessary) test for serial->dev being NULL in close.
The device is never cleared, and close is never called after a completed
disconnect anyway.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/serial/iuu_phoenix.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c index a3bfcb37f733..8eeefe3af0b6 100644 --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c | |||
@@ -951,14 +951,11 @@ static void iuu_close(struct usb_serial_port *port) | |||
951 | return; | 951 | return; |
952 | 952 | ||
953 | iuu_uart_off(port); | 953 | iuu_uart_off(port); |
954 | if (serial->dev) { | 954 | |
955 | /* free writebuf */ | 955 | usb_kill_urb(port->write_urb); |
956 | /* shutdown our urbs */ | 956 | usb_kill_urb(port->read_urb); |
957 | dev_dbg(&port->dev, "%s - shutting down urbs\n", __func__); | 957 | |
958 | usb_kill_urb(port->write_urb); | 958 | iuu_led(port, 0, 0, 0xF000, 0xFF); |
959 | usb_kill_urb(port->read_urb); | ||
960 | iuu_led(port, 0, 0, 0xF000, 0xFF); | ||
961 | } | ||
962 | } | 959 | } |
963 | 960 | ||
964 | static void iuu_init_termios(struct tty_struct *tty) | 961 | static void iuu_init_termios(struct tty_struct *tty) |