diff options
| author | Johan Hovold <jhovold@gmail.com> | 2012-11-18 07:23:29 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 16:33:55 -0500 |
| commit | 2a2c511ca62c87ead992bff0e3cd43a32b28e6e0 (patch) | |
| tree | 0a89d1f952154aadac8bee6a9c6351e528d9f4cf | |
| parent | 70f9bf65a4413cb3c7405b2078efb8b27acc7222 (diff) | |
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>
| -rw-r--r-- | drivers/usb/serial/opticon.c | 8 |
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: | |||
| 518 | return retval; | 518 | return retval; |
| 519 | } | 519 | } |
| 520 | 520 | ||
| 521 | static void opticon_disconnect(struct usb_serial *serial) | ||
| 522 | { | ||
| 523 | struct opticon_private *priv = usb_get_serial_data(serial); | ||
| 524 | |||
| 525 | usb_kill_urb(priv->bulk_read_urb); | ||
| 526 | } | ||
| 527 | |||
| 528 | static void opticon_release(struct usb_serial *serial) | 521 | static void opticon_release(struct usb_serial *serial) |
| 529 | { | 522 | { |
| 530 | struct opticon_private *priv = usb_get_serial_data(serial); | 523 | struct opticon_private *priv = usb_get_serial_data(serial); |
| @@ -570,7 +563,6 @@ static struct usb_serial_driver opticon_device = { | |||
| 570 | .close = opticon_close, | 563 | .close = opticon_close, |
| 571 | .write = opticon_write, | 564 | .write = opticon_write, |
| 572 | .write_room = opticon_write_room, | 565 | .write_room = opticon_write_room, |
| 573 | .disconnect = opticon_disconnect, | ||
| 574 | .release = opticon_release, | 566 | .release = opticon_release, |
| 575 | .throttle = opticon_throttle, | 567 | .throttle = opticon_throttle, |
| 576 | .unthrottle = opticon_unthrottle, | 568 | .unthrottle = opticon_unthrottle, |
