diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 11:04:24 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 11:04:24 +0200 |
| commit | 42f1d2e06a25628ae4ceaadccc4fa67c7787e2b4 (patch) | |
| tree | 8aac83e399de7ad13748a59853a0feea9ed2c5cb /drivers/usb/serial/ftdi_sio.c | |
| parent | Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/... (diff) | |
| parent | davinci: defconfig update: add EMAC (diff) | |
| download | linux-42f1d2e06a25628ae4ceaadccc4fa67c7787e2b4.tar.xz linux-42f1d2e06a25628ae4ceaadccc4fa67c7787e2b4.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 0ab8474b00cb..d9fcdaedf389 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1487,14 +1487,7 @@ static int ftdi_sio_port_remove(struct usb_serial_port *port) remove_sysfs_attrs(port); - /* all open ports are closed at this point - * (by usbserial.c:__serial_close, which calls ftdi_close) - */ - - if (priv) { - usb_set_serial_port_data(port, NULL); - kref_put(&priv->kref, ftdi_sio_priv_release); - } + kref_put(&priv->kref, ftdi_sio_priv_release); return 0; } |