USB: iuu_phoenix: remove bogus disconnect test in close
authorJohan Hovold <jhovold@gmail.com>
Thu, 21 Mar 2013 11:36:31 +0000 (12:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Mar 2013 20:44:17 +0000 (13:44 -0700)
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>
drivers/usb/serial/iuu_phoenix.c

index a3bfcb37f733cd578187690c25a076c4bb54a411..8eeefe3af0b62135ad74d4dd23fea012da0478d7 100644 (file)
@@ -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)