Commit 6d443d84 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Greg Kroah-Hartman

usb: io_ti: Make edge_remove_sysfs_attrs the port_remove method.

Calling edge_remove_sysfs_attrs from edge_disconnect is too late
as the device has already been removed from sysfs.

Do the simple and obvious thing and make edge_remove_sysfs_attrs
the port_remove method.
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Reported-by: default avatarWolfgang Frisch <wfpub@roembden.net>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 52a74999
...@@ -2657,15 +2657,7 @@ static int edge_startup(struct usb_serial *serial) ...@@ -2657,15 +2657,7 @@ static int edge_startup(struct usb_serial *serial)
static void edge_disconnect(struct usb_serial *serial) static void edge_disconnect(struct usb_serial *serial)
{ {
int i;
struct edgeport_port *edge_port;
dbg("%s", __func__); dbg("%s", __func__);
for (i = 0; i < serial->num_ports; ++i) {
edge_port = usb_get_serial_port_data(serial->port[i]);
edge_remove_sysfs_attrs(edge_port->port);
}
} }
static void edge_release(struct usb_serial *serial) static void edge_release(struct usb_serial *serial)
...@@ -2744,6 +2736,7 @@ static struct usb_serial_driver edgeport_1port_device = { ...@@ -2744,6 +2736,7 @@ static struct usb_serial_driver edgeport_1port_device = {
.disconnect = edge_disconnect, .disconnect = edge_disconnect,
.release = edge_release, .release = edge_release,
.port_probe = edge_create_sysfs_attrs, .port_probe = edge_create_sysfs_attrs,
.port_remove = edge_remove_sysfs_attrs,
.ioctl = edge_ioctl, .ioctl = edge_ioctl,
.set_termios = edge_set_termios, .set_termios = edge_set_termios,
.tiocmget = edge_tiocmget, .tiocmget = edge_tiocmget,
...@@ -2775,6 +2768,7 @@ static struct usb_serial_driver edgeport_2port_device = { ...@@ -2775,6 +2768,7 @@ static struct usb_serial_driver edgeport_2port_device = {
.disconnect = edge_disconnect, .disconnect = edge_disconnect,
.release = edge_release, .release = edge_release,
.port_probe = edge_create_sysfs_attrs, .port_probe = edge_create_sysfs_attrs,
.port_remove = edge_remove_sysfs_attrs,
.ioctl = edge_ioctl, .ioctl = edge_ioctl,
.set_termios = edge_set_termios, .set_termios = edge_set_termios,
.tiocmget = edge_tiocmget, .tiocmget = edge_tiocmget,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment