aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/opticon.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-11-18 13:23:29 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 13:33:55 -0800
commit2a2c511ca62c87ead992bff0e3cd43a32b28e6e0 (patch)
tree0a89d1f952154aadac8bee6a9c6351e528d9f4cf /drivers/usb/serial/opticon.c
parentUSB: opticon: move read-urb deallocation to release (diff)
downloadlinux-dev-2a2c511ca62c87ead992bff0e3cd43a32b28e6e0.tar.xz
linux-dev-2a2c511ca62c87ead992bff0e3cd43a32b28e6e0.zip
USB: opticon: remove disconnect
Remove disconnect and its redundant read-urb kill which is already taken care of in close. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/opticon.c')
-rw-r--r--drivers/usb/serial/opticon.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 77700b0720c6..2fb71d8c3a95 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -518,13 +518,6 @@ error:
return retval;
}
-static void opticon_disconnect(struct usb_serial *serial)
-{
- struct opticon_private *priv = usb_get_serial_data(serial);
-
- usb_kill_urb(priv->bulk_read_urb);
-}
-
static void opticon_release(struct usb_serial *serial)
{
struct opticon_private *priv = usb_get_serial_data(serial);
@@ -570,7 +563,6 @@ static struct usb_serial_driver opticon_device = {
.close = opticon_close,
.write = opticon_write,
.write_room = opticon_write_room,
- .disconnect = opticon_disconnect,
.release = opticon_release,
.throttle = opticon_throttle,
.unthrottle = opticon_unthrottle,