From: Johan Hovold Date: Thu, 21 Mar 2013 11:36:34 +0000 (+0100) Subject: USB: keyspan_pda: remove bogus disconnect test in close X-Git-Tag: v3.10-rc1~190^2~192 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75d22b323fad49715068f74af9e65dbaba06614e;p=platform%2Fupstream%2Fkernel-adaptation-pc.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index 0d992ba..da3b29e 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); }