summaryrefslogtreecommitdiff
path: root/drivers/usb/serial/ark3116.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2010-03-18 01:00:45 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-21 00:21:33 +0400
commitf26788da3b342099d2b02d99ba1cb7f154d6ef7b (patch)
tree91b6af77130e5f93b9226254a651434af5d8340b /drivers/usb/serial/ark3116.c
parentec3ee5086c1e1b883292eaf795b5c1b0c25bcffe (diff)
downloadlinux-f26788da3b342099d2b02d99ba1cb7f154d6ef7b.tar.xz
USB: serial: refactor generic close
Export usb_serial_generic_close so that drivers can easily kill the read and write urb and make sure that the write fifo is reset. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/ark3116.c')
-rw-r--r--drivers/usb/serial/ark3116.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index 9b66bf19f751..0ae610efa23d 100644
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -355,14 +355,11 @@ static void ark3116_close(struct usb_serial_port *port)
/* deactivate interrupts */
ark3116_write_reg(serial, UART_IER, 0);
- /* shutdown any bulk reads that might be going on */
- if (serial->num_bulk_out)
- usb_kill_urb(port->write_urb);
- if (serial->num_bulk_in)
- usb_kill_urb(port->read_urb);
+ usb_serial_generic_close(port);
if (serial->num_interrupt_in)
usb_kill_urb(port->interrupt_in_urb);
}
+
}
static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port)