USB: garmin_gps: remove bogus disconnect test in close
authorJohan Hovold <jhovold@gmail.com>
Thu, 21 Mar 2013 11:37:48 +0000 (12:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Mar 2013 20:54:32 +0000 (13:54 -0700)
Remove bogus disconnect test for serial device being NULL in close. This
can never happen as close is guaranteed to be called before the last tty
reference is dropped (and port->serial is cleared).

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/garmin_gps.c

index 81caf5623ee295d609acce00a1e06a20ef34c20f..1ade6cf23f7edb301c2137c2d35b09db6513bc94 100644 (file)
@@ -946,16 +946,12 @@ static int garmin_open(struct tty_struct *tty, struct usb_serial_port *port)
 
 static void garmin_close(struct usb_serial_port *port)
 {
-       struct usb_serial *serial = port->serial;
        struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
 
        dev_dbg(&port->dev, "%s - port %d - mode=%d state=%d flags=0x%X\n",
                __func__, port->number, garmin_data_p->mode,
                garmin_data_p->state, garmin_data_p->flags);
 
-       if (!serial)
-               return;
-
        garmin_clear(garmin_data_p);
 
        /* shutdown our urbs */