diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-03-21 12:36:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 13:44:17 -0700 |
| commit | 1bc77f4df6b11948893cb1427fb6211c94f51364 (patch) | |
| tree | b8a4d35e9fecd2f14a2848ab29c9054f32bfe27b /drivers | |
| parent | 5c3275282422dcb895e2e9902c7fba4fd9d2512b (diff) | |
| download | talos-op-linux-1bc77f4df6b11948893cb1427fb6211c94f51364.tar.gz talos-op-linux-1bc77f4df6b11948893cb1427fb6211c94f51364.zip | |
USB: cyberjack: 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/serial/cyberjack.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c index 629bd2894506..de9253d63a48 100644 --- a/drivers/usb/serial/cyberjack.c +++ b/drivers/usb/serial/cyberjack.c @@ -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, |
