diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-14 14:40:22 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-14 14:40:31 +1000 |
| commit | e8cd7f10007c8ea84f87da143b8972462f06fc2e (patch) | |
| tree | f5fc28f2ea844f9b7ec07066525d76eb9339666a /drivers/usb/serial/mct_u232.c | |
| parent | 2b244c0fb87051a9d9a90655c4de3b8c7f7a68ac (diff) | |
| parent | 326f6b9e3431305d48fc1331295e945d445338e2 (diff) | |
Merge branch 'quilt/usb'
Conflicts:
drivers/input/tablet/acecad.c
drivers/input/tablet/kbtab.c
drivers/input/tablet/wacom_sys.c
drivers/media/video/gspca/gspca.c
sound/usb/usbaudio.c
Diffstat (limited to 'drivers/usb/serial/mct_u232.c')
| -rw-r--r-- | drivers/usb/serial/mct_u232.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c index 2849f8c32015..7aa01b95b1d4 100644 --- a/drivers/usb/serial/mct_u232.c +++ b/drivers/usb/serial/mct_u232.c @@ -549,12 +549,9 @@ static void mct_u232_close(struct usb_serial_port *port) { dbg("%s port %d", __func__, port->number); - if (port->serial->dev) { - /* shutdown our urbs */ - usb_kill_urb(port->write_urb); - usb_kill_urb(port->read_urb); + usb_serial_generic_close(port); + if (port->serial->dev) usb_kill_urb(port->interrupt_in_urb); - } } /* mct_u232_close */ |