diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-03-21 12:36:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 21:44:17 +0100 |
| commit | 853127faa43f4971c4e9fc506bb86622208ca935 (patch) | |
| tree | 3895347a8f51ad1ecb5825ffb877abb80849e8ec | |
| parent | USB: digi_acceleport: remove bogus disconnect test in close (diff) | |
| download | linux-853127faa43f4971c4e9fc506bb86622208ca935.tar.xz linux-853127faa43f4971c4e9fc506bb86622208ca935.zip | |
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) return; iuu_uart_off(port); - if (serial->dev) { - /* free writebuf */ - /* shutdown our urbs */ - dev_dbg(&port->dev, "%s - shutting down urbs\n", __func__); - usb_kill_urb(port->write_urb); - usb_kill_urb(port->read_urb); - iuu_led(port, 0, 0, 0xF000, 0xFF); - } + + usb_kill_urb(port->write_urb); + usb_kill_urb(port->read_urb); + + iuu_led(port, 0, 0, 0xF000, 0xFF); } static void iuu_init_termios(struct tty_struct *tty) |