diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-02-24 23:17:07 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-24 23:17:07 +0300 |
| commit | e11d57ca0b6dada29007ce3ad3db6c84034a768f (patch) | |
| tree | 39ad0c208e2cb3da79f958bd0e9d0d12b8e5f8fe /drivers/usb/serial/oti6858.c | |
| parent | 317495b25ec1f0beb0dbac8ee0dfec59a1addf03 (diff) | |
| parent | a2c06ee2fe5b48a71e697bae00c6e7195fc016b6 (diff) | |
| download | linux-e11d57ca0b6dada29007ce3ad3db6c84034a768f.tar.xz | |
Merge remote-tracking branch 'airlied/drm-core-next' into drm-nouveau-next
Diffstat (limited to 'drivers/usb/serial/oti6858.c')
| -rw-r--r-- | drivers/usb/serial/oti6858.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index e199b0f4f99c..73613205be7a 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c @@ -157,6 +157,7 @@ static struct usb_serial_driver oti6858_device = { .name = "oti6858", }, .id_table = id_table, + .usb_driver = &oti6858_driver, .num_ports = 1, .open = oti6858_open, .close = oti6858_close, @@ -613,9 +614,8 @@ static void oti6858_close(struct usb_serial_port *port) dbg("%s(): after buf_clear()", __func__); /* cancel scheduled setup */ - cancel_delayed_work(&priv->delayed_setup_work); - cancel_delayed_work(&priv->delayed_write_work); - flush_scheduled_work(); + cancel_delayed_work_sync(&priv->delayed_setup_work); + cancel_delayed_work_sync(&priv->delayed_write_work); /* shutdown our urbs */ dbg("%s(): shutting down urbs", __func__); |