]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
kaweth: fix firmware download
authorOliver Neukum <oneukum@suse.com>
Wed, 17 Aug 2016 13:51:55 +0000 (15:51 +0200)
committerWilly Tarreau <w@1wt.eu>
Fri, 10 Feb 2017 10:03:57 +0000 (11:03 +0100)
commit 60bcabd080f53561efa9288be45c128feda1a8bb upstream.

This fixes the oops discovered by the Umap2 project and Alan Stern.
The intf member needs to be set before the firmware is downloaded.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/net/usb/kaweth.c

index afb117c16d2d3688b62952ec2251f29c29eee06c..8ba774de34743a19d8b3fb5ae4b324bbe32dbb6b 100644 (file)
@@ -1031,6 +1031,7 @@ static int kaweth_probe(
        kaweth = netdev_priv(netdev);
        kaweth->dev = udev;
        kaweth->net = netdev;
+       kaweth->intf = intf;
 
        spin_lock_init(&kaweth->device_lock);
        init_waitqueue_head(&kaweth->term_wait);
@@ -1141,8 +1142,6 @@ err_fw:
 
        dev_dbg(dev, "Initializing net device.\n");
 
-       kaweth->intf = intf;
-
        kaweth->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!kaweth->tx_urb)
                goto err_free_netdev;