diff options
author | Johan Hovold <jhovold@gmail.com> | 2013-03-19 09:21:07 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-28 12:12:27 -0700 |
commit | 00de47e3ba24ddad37496c47aae5753862024900 (patch) | |
tree | 82606b7bc4bd33e65f41726c9247ec165d9dd6a0 /drivers | |
parent | bc914c3b5ebcf158419c4901ec54ffbd7677d5a0 (diff) | |
download | lwn-00de47e3ba24ddad37496c47aae5753862024900.tar.gz lwn-00de47e3ba24ddad37496c47aae5753862024900.zip |
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>
Diffstat (limited to 'drivers')
-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 e8eb6347bf3a..ba5b527957e5 100644 --- a/drivers/usb/serial/garmin_gps.c +++ b/drivers/usb/serial/garmin_gps.c @@ -971,10 +971,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); @@ -983,8 +980,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); } |