ftgmac100: Request the interrupt only after HW is reset

The interrupt isn't shared, so this will keep it masked
until we have the HW in a known sane state.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index c8b4e6488545497d3bd1d518993e5ca10008a285..09d06e2b78bd9f808d148e1bf639673ff93dd8d1 100644 (file)
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1131,12 +1131,6 @@ static int ftgmac100_open(struct net_device *netdev)
        if (ftgmac100_alloc_rx_buffers(priv))
                goto err_alloc;
 
-       err = request_irq(netdev->irq, ftgmac100_interrupt, 0, netdev->name, netdev);
-       if (err) {
-               netdev_err(netdev, "failed to request irq %d\n", netdev->irq);
-               goto err_irq;
-       }
-
        /* When using NC-SI we force the speed to 100Mbit/s full duplex,
         *
         * Otherwise we leave it set to 0 (no link), the link
@@ -1163,6 +1157,13 @@ static int ftgmac100_open(struct net_device *netdev)
        /* Initialize NAPI */
        netif_napi_add(netdev, &priv->napi, ftgmac100_poll, 64);
 
+       /* Grab our interrupt */
+       err = request_irq(netdev->irq, ftgmac100_interrupt, 0, netdev->name, netdev);
+       if (err) {
+               netdev_err(netdev, "failed to request irq %d\n", netdev->irq);
+               goto err_irq;
+       }
+
        ftgmac100_init_hw(priv);
        ftgmac100_start_hw(priv);
 
@@ -1193,12 +1194,12 @@ static int ftgmac100_open(struct net_device *netdev)
 err_ncsi:
        napi_disable(&priv->napi);
        netif_stop_queue(netdev);
-       netif_napi_del(&priv->napi);
-       iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);
-err_hw:
        free_irq(netdev->irq, netdev);
 err_irq:
+       netif_napi_del(&priv->napi);
+err_hw:
 err_alloc:
+       iowrite32(0, priv->base + FTGMAC100_OFFSET_IER);
        ftgmac100_free_buffers(priv);
        ftgmac100_free_rings(priv);
        return err;