Merge branch 'for-next' into for-linus

[linux-2.6-microblaze.git] / sound / usb / line6 / driver.c

diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index 3e07251..60674ce 100644 (file)
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -841,7 +841,7 @@ void line6_disconnect(struct usb_interface *interface)
        if (WARN_ON(usbdev != line6->usbdev))
                return;
 
-       cancel_delayed_work(&line6->startup_work);
+       cancel_delayed_work_sync(&line6->startup_work);
 
        if (line6->urb_listen != NULL)
                line6_stop_listen(line6);