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-16 00:44:47 -0400 |
commit | f9c99bb8b3a1ec81af68d484a551307326c2e933 (patch) | |
tree | 9031ebe390ecd558d54ad484dde5ba66dcf823b7 /drivers/usb/serial/ipaq.c | |
parent | c706ebdfc8955b850e477255a8c0f93f9f14712d (diff) |
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/ipaq.c')
-rw-r--r-- | drivers/usb/serial/ipaq.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index c610a99fa477..2545d45ce16f 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c | |||
@@ -79,7 +79,6 @@ static int ipaq_open(struct tty_struct *tty, | |||
79 | static void ipaq_close(struct usb_serial_port *port); | 79 | static void ipaq_close(struct usb_serial_port *port); |
80 | static int ipaq_calc_num_ports(struct usb_serial *serial); | 80 | static int ipaq_calc_num_ports(struct usb_serial *serial); |
81 | static int ipaq_startup(struct usb_serial *serial); | 81 | static int ipaq_startup(struct usb_serial *serial); |
82 | static void ipaq_shutdown(struct usb_serial *serial); | ||
83 | static int ipaq_write(struct tty_struct *tty, struct usb_serial_port *port, | 82 | static int ipaq_write(struct tty_struct *tty, struct usb_serial_port *port, |
84 | const unsigned char *buf, int count); | 83 | const unsigned char *buf, int count); |
85 | static int ipaq_write_bulk(struct usb_serial_port *port, | 84 | static int ipaq_write_bulk(struct usb_serial_port *port, |
@@ -576,7 +575,6 @@ static struct usb_serial_driver ipaq_device = { | |||
576 | .close = ipaq_close, | 575 | .close = ipaq_close, |
577 | .attach = ipaq_startup, | 576 | .attach = ipaq_startup, |
578 | .calc_num_ports = ipaq_calc_num_ports, | 577 | .calc_num_ports = ipaq_calc_num_ports, |
579 | .shutdown = ipaq_shutdown, | ||
580 | .write = ipaq_write, | 578 | .write = ipaq_write, |
581 | .write_room = ipaq_write_room, | 579 | .write_room = ipaq_write_room, |
582 | .chars_in_buffer = ipaq_chars_in_buffer, | 580 | .chars_in_buffer = ipaq_chars_in_buffer, |
@@ -990,11 +988,6 @@ static int ipaq_startup(struct usb_serial *serial) | |||
990 | return usb_reset_configuration(serial->dev); | 988 | return usb_reset_configuration(serial->dev); |
991 | } | 989 | } |
992 | 990 | ||
993 | static void ipaq_shutdown(struct usb_serial *serial) | ||
994 | { | ||
995 | dbg("%s", __func__); | ||
996 | } | ||
997 | |||
998 | static int __init ipaq_init(void) | 991 | static int __init ipaq_init(void) |
999 | { | 992 | { |
1000 | int retval; | 993 | int retval; |