leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: Sierra: fix oops upon device close

Browse Source 
This patch (as1263) fixes a mixup that occurred when conflicting
patches for the sierra driver were merged incorrectly.  The former
sierra_shutdown routine should have been become sierra_release, not
sierra_disconnect.

The symptom this fixes is an oops when the device file is closed after
a Sierra device has been unplugged (Bugzilla #13675).

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Tested-by: Peter Naulls <peter@mushroomnetworks.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern 2009-07-07 09:50:14 -04:00 committed by Greg Kroah-Hartman
parent c3325eb16d
commit 7bae0a070d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/serial/sierra.c
View File

@ -814,7 +814,7 @@ static int sierra_startup(struct usb_serial *serial)
return 0; return 0;
} }
static void sierra_disconnect(struct usb_serial *serial) static void sierra_release(struct usb_serial *serial)
{ {
int i; int i;
struct usb_serial_port *port; struct usb_serial_port *port;
@ -830,7 +830,6 @@ static void sierra_disconnect(struct usb_serial *serial)
if (!portdata) if (!portdata)
continue; continue;
kfree(portdata); kfree(portdata);
usb_set_serial_port_data(port, NULL);
} }
} }
@ -853,7 +852,7 @@ static struct usb_serial_driver sierra_device = {
.tiocmget = sierra_tiocmget, .tiocmget = sierra_tiocmget,
.tiocmset = sierra_tiocmset, .tiocmset = sierra_tiocmset,
.attach = sierra_startup, .attach = sierra_startup,
.disconnect = sierra_disconnect, .release = sierra_release,
.read_int_callback = sierra_instat_callback, .read_int_callback = sierra_instat_callback,
}; };