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

[mv-sheeva.git] / drivers / net / usb / sierra_net.c

diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index d1ac15c95faf6d00803a67c7e4c9294e8299984f..ed1b4321058487a62530442586d7f0c2f7628dff 100644 (file)
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -802,10 +802,9 @@ static void sierra_net_unbind(struct usbnet *dev, struct usb_interface *intf)
 
        dev_dbg(&dev->udev->dev, "%s", __func__);
 
-       /* Kill the timer then flush the work queue */
+       /* kill the timer and work */
        del_timer_sync(&priv->sync_timer);
-
-       flush_scheduled_work();
+       cancel_work_sync(&priv->sierra_net_kevent);
 
        /* tell modem we are going away */
        status = sierra_net_send_cmd(dev, priv->shdwn_msg,