USB: cyberjack: remove bogus disconnect test in close
authorJohan Hovold <jhovold@gmail.com>
Thu, 21 Mar 2013 11:36:29 +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/cyberjack.c

index 629bd2894506344e2177d4191d1b9e4a19a8b6f4..de9253d63a480c50015fa1640172963ed04751c6 100644 (file)
@@ -166,11 +166,8 @@ static int  cyberjack_open(struct tty_struct *tty,
 
 static void cyberjack_close(struct usb_serial_port *port)
 {
-       if (port->serial->dev) {
-               /* shutdown any bulk reads that might be going on */
-               usb_kill_urb(port->write_urb);
-               usb_kill_urb(port->read_urb);
-       }
+       usb_kill_urb(port->write_urb);
+       usb_kill_urb(port->read_urb);
 }
 
 static int cyberjack_write(struct tty_struct *tty,