diff options
author | Johan Hovold <jhovold@gmail.com> | 2010-03-17 18:00:45 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:33 -0400 |
commit | f26788da3b342099d2b02d99ba1cb7f154d6ef7b (patch) | |
tree | 91b6af77130e5f93b9226254a651434af5d8340b /drivers/usb/serial/ark3116.c | |
parent | ec3ee5086c1e1b883292eaf795b5c1b0c25bcffe (diff) |
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.c | 7 |
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) | |||
355 | /* deactivate interrupts */ | 355 | /* deactivate interrupts */ |
356 | ark3116_write_reg(serial, UART_IER, 0); | 356 | ark3116_write_reg(serial, UART_IER, 0); |
357 | 357 | ||
358 | /* shutdown any bulk reads that might be going on */ | 358 | usb_serial_generic_close(port); |
359 | if (serial->num_bulk_out) | ||
360 | usb_kill_urb(port->write_urb); | ||
361 | if (serial->num_bulk_in) | ||
362 | usb_kill_urb(port->read_urb); | ||
363 | if (serial->num_interrupt_in) | 359 | if (serial->num_interrupt_in) |
364 | usb_kill_urb(port->interrupt_in_urb); | 360 | usb_kill_urb(port->interrupt_in_urb); |
365 | } | 361 | } |
362 | |||
366 | } | 363 | } |
367 | 364 | ||
368 | static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port) | 365 | static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port) |