Merge tag 'usb-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[cascardo/linux.git] / drivers / net / ethernet / wiznet / w5100.c

diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index 4f6255c..37ab46c 100644 (file)
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -1154,7 +1154,7 @@ int w5100_probe(struct device *dev, const struct w5100_ops *ops,
        if (err < 0)
                goto err_register;
 
-       priv->xfer_wq = create_workqueue(netdev_name(ndev));
+       priv->xfer_wq = alloc_workqueue(netdev_name(ndev), WQ_MEM_RECLAIM, 0);
        if (!priv->xfer_wq) {
                err = -ENOMEM;
                goto err_wq;
@@ -1233,7 +1233,6 @@ int w5100_remove(struct device *dev)
 
        flush_work(&priv->setrx_work);
        flush_work(&priv->restart_work);
-       flush_workqueue(priv->xfer_wq);
        destroy_workqueue(priv->xfer_wq);
 
        unregister_netdev(ndev);