diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-03-19 09:21:07 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-03-27 02:41:22 +0000 |
| commit | 6092e4b9e78afcaf0aee456cc4878e499dc0bb34 (patch) | |
| tree | 5ed56321241c0419f9885799a6c12c3938849ad8 /drivers/usb/serial/garmin_gps.c | |
| parent | bbb8c22360473df0d982181a0cf69780ad2b10d1 (diff) | |
| download | kernel_samsung_smdk4412-6092e4b9e78afcaf0aee456cc4878e499dc0bb34.zip kernel_samsung_smdk4412-6092e4b9e78afcaf0aee456cc4878e499dc0bb34.tar.gz kernel_samsung_smdk4412-6092e4b9e78afcaf0aee456cc4878e499dc0bb34.tar.bz2 | |
USB: garmin_gps: fix memory leak on disconnect
commit 618aa1068df29c37a58045fe940f9106664153fd upstream.
Remove bogus disconnect test introduced by 95bef012e ("USB: more serial
drivers writing after disconnect") which prevented queued data from
being freed on disconnect.
The possible IO it was supposed to prevent is long gone.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/serial/garmin_gps.c')
| -rw-r--r-- | drivers/usb/serial/garmin_gps.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c index 1a49ca9..e664bac 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c @@ -973,10 +973,7 @@ static void garmin_close(struct usb_serial_port *port) if (!serial) return; - mutex_lock(&port->serial->disc_mutex); - - if (!port->serial->disconnected) - garmin_clear(garmin_data_p); + garmin_clear(garmin_data_p); /* shutdown our urbs */ usb_kill_urb(port->read_urb); @@ -985,8 +982,6 @@ static void garmin_close(struct usb_serial_port *port) /* keep reset state so we know that we must start a new session */ if (garmin_data_p->state != STATE_RESET) garmin_data_p->state = STATE_DISCONNECTED; - - mutex_unlock(&port->serial->disc_mutex); } |