aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/keyspan_pda.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-03-21 12:36:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 13:44:18 -0700
commit75d22b323fad49715068f74af9e65dbaba06614e (patch)
tree8f672478bc400f5b0fd45f93cddf17dc6b6d534c /drivers/usb/serial/keyspan_pda.c
parentUSB: keyspan_pda: remove bogus disconnect test from dtr_rts (diff)
downloadlinux-dev-75d22b323fad49715068f74af9e65dbaba06614e.tar.xz
linux-dev-75d22b323fad49715068f74af9e65dbaba06614e.zip
USB: keyspan_pda: 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/usb/serial/keyspan_pda.c')
-rw-r--r--drivers/usb/serial/keyspan_pda.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 0d992ba7bd05..da3b29eb605c 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -649,13 +649,8 @@ error:
}
static void keyspan_pda_close(struct usb_serial_port *port)
{
- struct usb_serial *serial = port->serial;
-
- if (serial->dev) {
- /* shutdown our bulk reads and writes */
- usb_kill_urb(port->write_urb);
- usb_kill_urb(port->interrupt_in_urb);
- }
+ usb_kill_urb(port->write_urb);
+ usb_kill_urb(port->interrupt_in_urb);
}