diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2009-06-02 11:53:55 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-15 21:44:47 -0700 |
| commit | f9c99bb8b3a1ec81af68d484a551307326c2e933 (patch) | |
| tree | 9031ebe390ecd558d54ad484dde5ba66dcf823b7 /drivers/usb/serial/keyspan.c | |
| parent | c706ebdfc8955b850e477255a8c0f93f9f14712d (diff) | |
| download | kernel_samsung_smdk4412-f9c99bb8b3a1ec81af68d484a551307326c2e933.zip kernel_samsung_smdk4412-f9c99bb8b3a1ec81af68d484a551307326c2e933.tar.gz kernel_samsung_smdk4412-f9c99bb8b3a1ec81af68d484a551307326c2e933.tar.bz2 | |
USB: usb-serial: replace shutdown with disconnect, release
This patch (as1254) splits up the shutdown method of usb_serial_driver
into a disconnect and a release method.
The problem is that the usb-serial core was calling shutdown during
disconnect handling, but drivers didn't expect it to be called until
after all the open file references had been closed. The result was an
oops when the close method tried to use memory that had been
deallocated by shutdown.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/keyspan.c')
| -rw-r--r-- | drivers/usb/serial/keyspan.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index f1195a9..2594b87 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c @@ -2689,7 +2689,7 @@ static int keyspan_startup(struct usb_serial *serial) return 0; } -static void keyspan_shutdown(struct usb_serial *serial) +static void keyspan_disconnect(struct usb_serial *serial) { int i, j; struct usb_serial_port *port; @@ -2729,6 +2729,17 @@ static void keyspan_shutdown(struct usb_serial *serial) usb_free_urb(p_priv->out_urbs[j]); } } +} + +static void keyspan_release(struct usb_serial *serial) +{ + int i; + struct usb_serial_port *port; + struct keyspan_serial_private *s_priv; + + dbg("%s", __func__); + + s_priv = usb_get_serial_data(serial); /* dbg("Freeing serial->private."); */ kfree(s_priv); |