aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-03-21 07:37:48 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-25 16:54:32 -0400
commit91972724525829a9399a2cb41e60cad853b09229 (patch)
treee6953a141320ef9ffcd8c349385b56bc1e681c71 /drivers/usb/serial
parent7620c33afb643451e1cbdc7fa666842440f8af63 (diff)
USB: garmin_gps: remove bogus disconnect test in close
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>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/garmin_gps.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 81caf5623ee2..1ade6cf23f7e 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -946,16 +946,12 @@ static int garmin_open(struct tty_struct *tty, struct usb_serial_port *port)
946 946
947static void garmin_close(struct usb_serial_port *port) 947static void garmin_close(struct usb_serial_port *port)
948{ 948{
949 struct usb_serial *serial = port->serial;
950 struct garmin_data *garmin_data_p = usb_get_serial_port_data(port); 949 struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
951 950
952 dev_dbg(&port->dev, "%s - port %d - mode=%d state=%d flags=0x%X\n", 951 dev_dbg(&port->dev, "%s - port %d - mode=%d state=%d flags=0x%X\n",
953 __func__, port->number, garmin_data_p->mode, 952 __func__, port->number, garmin_data_p->mode,
954 garmin_data_p->state, garmin_data_p->flags); 953 garmin_data_p->state, garmin_data_p->flags);
955 954
956 if (!serial)
957 return;
958
959 garmin_clear(garmin_data_p); 955 garmin_clear(garmin_data_p);
960 956
961 /* shutdown our urbs */ 957 /* shutdown our urbs */