Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / irda / mcs7780.c

diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c
index 74b20f179cea029be0f2767fac5e3b04cee987a6..cc821de2c9669bb5c9e17bda80e3d98372c9d9f0 100644 (file)
--- a/drivers/net/irda/mcs7780.c
+++ b/drivers/net/irda/mcs7780.c
@@ -959,7 +959,7 @@ static void mcs_disconnect(struct usb_interface *intf)
        if (!mcs)
                return;
 
-       flush_scheduled_work();
+       cancel_work_sync(&mcs->work);
 
        unregister_netdev(mcs->netdev);
        free_netdev(mcs->netdev);