[PATCH] isdn4linux: Gigaset driver: fix __must_check warning

[linux-2.6-omap-h63xx.git] / drivers / usb / net / rtl8150.c

diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c
index bd09232ce13c5fc5052d708a18315bf6498a08a4..2364c20993874f381c4975430000a56fb8a4a9a4 100644 (file)
--- a/drivers/usb/net/rtl8150.c
+++ b/drivers/usb/net/rtl8150.c
@@ -438,7 +438,7 @@ static void read_bulk_callback(struct urb *urb, struct pt_regs *regs)
                break;
        case -ENOENT:
                return; /* the urb is in unlink state */
-       case -ETIMEDOUT:
+       case -ETIME:
                warn("may be reset is needed?..");
                goto goon;
        default:
@@ -972,6 +972,7 @@ static void rtl8150_disconnect(struct usb_interface *intf)
        if (dev) {
                set_bit(RTL8150_UNPLUG, &dev->flags);
                tasklet_disable(&dev->tl);
+               tasklet_kill(&dev->tl);
                unregister_netdev(dev->netdev);
                unlink_all_urbs(dev);
                free_all_urbs(dev);