Merge tag 'net-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[sfrench/cifs-2.6.git] / drivers / net / can / spi / mcp251x.c

diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c
index 492f1bcb05161a718435c1cee54e9e42c8dd1d38..173c6614086f3aa78f2a5072a4a70d3e72354eae 100644 (file)
--- a/drivers/net/can/spi/mcp251x.c
+++ b/drivers/net/can/spi/mcp251x.c
@@ -956,8 +956,6 @@ static int mcp251x_stop(struct net_device *net)
 
        priv->force_quit = 1;
        free_irq(spi->irq, priv);
-       destroy_workqueue(priv->wq);
-       priv->wq = NULL;
 
        mutex_lock(&priv->mcp_lock);
 
@@ -1224,24 +1222,15 @@ static int mcp251x_open(struct net_device *net)
                goto out_close;
        }
 
-       priv->wq = alloc_workqueue("mcp251x_wq", WQ_FREEZABLE | WQ_MEM_RECLAIM,
-                                  0);
-       if (!priv->wq) {
-               ret = -ENOMEM;
-               goto out_clean;
-       }
-       INIT_WORK(&priv->tx_work, mcp251x_tx_work_handler);
-       INIT_WORK(&priv->restart_work, mcp251x_restart_work_handler);
-
        ret = mcp251x_hw_wake(spi);
        if (ret)
-               goto out_free_wq;
+               goto out_free_irq;
        ret = mcp251x_setup(net, spi);
        if (ret)
-               goto out_free_wq;
+               goto out_free_irq;
        ret = mcp251x_set_normal_mode(spi);
        if (ret)
-               goto out_free_wq;
+               goto out_free_irq;
 
        can_led_event(net, CAN_LED_EVENT_OPEN);
 
@@ -1250,9 +1239,7 @@ static int mcp251x_open(struct net_device *net)
 
        return 0;
 
-out_free_wq:
-       destroy_workqueue(priv->wq);
-out_clean:
+out_free_irq:
        free_irq(spi->irq, priv);
        mcp251x_hw_sleep(spi);
 out_close:
@@ -1373,6 +1360,15 @@ static int mcp251x_can_probe(struct spi_device *spi)
        if (ret)
                goto out_clk;
 
+       priv->wq = alloc_workqueue("mcp251x_wq", WQ_FREEZABLE | WQ_MEM_RECLAIM,
+                                  0);
+       if (!priv->wq) {
+               ret = -ENOMEM;
+               goto out_clk;
+       }
+       INIT_WORK(&priv->tx_work, mcp251x_tx_work_handler);
+       INIT_WORK(&priv->restart_work, mcp251x_restart_work_handler);
+
        priv->spi = spi;
        mutex_init(&priv->mcp_lock);
 
@@ -1417,6 +1413,8 @@ static int mcp251x_can_probe(struct spi_device *spi)
        return 0;
 
 error_probe:
+       destroy_workqueue(priv->wq);
+       priv->wq = NULL;
        mcp251x_power_enable(priv->power, 0);
 
 out_clk:
@@ -1438,6 +1436,9 @@ static int mcp251x_can_remove(struct spi_device *spi)
 
        mcp251x_power_enable(priv->power, 0);
 
+       destroy_workqueue(priv->wq);
+       priv->wq = NULL;
+
        clk_disable_unprepare(priv->clk);
 
        free_candev(net);