diff options
author | Johan Hovold <jhovold@gmail.com> | 2013-03-21 07:37:49 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 16:54:32 -0400 |
commit | 5dbabace4f8514500c729d3e4fe10b2811a35f15 (patch) | |
tree | ffa6b6397ba307fb47d2dc067756b8d46abf222a | |
parent | 91972724525829a9399a2cb41e60cad853b09229 (diff) |
USB: garmin_gps: remove bogus disconnect test in bulk callback
Remove bogus disconnect test for serial device being NULL in read bulk
callback. This can never happen as the port read urb is killed (and
poisoned) at close, which in turn 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>
-rw-r--r-- | drivers/usb/serial/garmin_gps.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index 1ade6cf23f7e..b110c573ea85 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c | |||
@@ -1181,17 +1181,11 @@ static void garmin_read_bulk_callback(struct urb *urb) | |||
1181 | { | 1181 | { |
1182 | unsigned long flags; | 1182 | unsigned long flags; |
1183 | struct usb_serial_port *port = urb->context; | 1183 | struct usb_serial_port *port = urb->context; |
1184 | struct usb_serial *serial = port->serial; | ||
1185 | struct garmin_data *garmin_data_p = usb_get_serial_port_data(port); | 1184 | struct garmin_data *garmin_data_p = usb_get_serial_port_data(port); |
1186 | unsigned char *data = urb->transfer_buffer; | 1185 | unsigned char *data = urb->transfer_buffer; |
1187 | int status = urb->status; | 1186 | int status = urb->status; |
1188 | int retval; | 1187 | int retval; |
1189 | 1188 | ||
1190 | if (!serial) { | ||
1191 | dev_dbg(&urb->dev->dev, "%s - bad serial pointer, exiting\n", __func__); | ||
1192 | return; | ||
1193 | } | ||
1194 | |||
1195 | if (status) { | 1189 | if (status) { |
1196 | dev_dbg(&urb->dev->dev, "%s - nonzero read bulk status received: %d\n", | 1190 | dev_dbg(&urb->dev->dev, "%s - nonzero read bulk status received: %d\n", |
1197 | __func__, status); | 1191 | __func__, status); |