2 files changed, 31 insertions, 17 deletions

diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c
index 364d0c7952c0..88ef27067bf2 100644
--- a/drivers/net/ethernet/ti/davinci_cpdma.c
+++ b/drivers/net/ethernet/ti/davinci_cpdma.c
@@ -355,7 +355,7 @@ int cpdma_ctlr_stop(struct cpdma_ctlr *ctlr)
         int i;
 
         spin_lock_irqsave(&ctlr->lock, flags);
-        if (ctlr->state != CPDMA_STATE_ACTIVE) {
+        if (ctlr->state == CPDMA_STATE_TEARDOWN) {
                 spin_unlock_irqrestore(&ctlr->lock, flags);
                 return -EINVAL;
         }
@@ -891,7 +891,7 @@ int cpdma_chan_stop(struct cpdma_chan *chan)
         unsigned                timeout;
 
         spin_lock_irqsave(&chan->lock, flags);
-        if (chan->state != CPDMA_STATE_ACTIVE) {
+        if (chan->state == CPDMA_STATE_TEARDOWN) {
                 spin_unlock_irqrestore(&chan->lock, flags);
                 return -EINVAL;
         }
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 251430450005..8f0e69ce07ca 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1533,8 +1533,8 @@ static int emac_dev_open(struct net_device *ndev)
         u32 cnt;
         struct resource *res;
         int q, m, ret;
+        int res_num = 0, irq_num = 0;
         int i = 0;
-        int k = 0;
         struct emac_priv *priv = netdev_priv(ndev);
 
         pm_runtime_get(&priv->pdev->dev);
@@ -1564,14 +1564,24 @@ static int emac_dev_open(struct net_device *ndev)
         }
 
         /* Request IRQ */
+        while ((res = platform_get_resource(priv->pdev, IORESOURCE_IRQ,
+                                            res_num))) {
+                for (irq_num = res->start; irq_num <= res->end; irq_num++) {
+                        dev_err(emac_dev, "Request IRQ %d\n", irq_num);
+                        if (request_irq(irq_num, emac_irq, 0, ndev->name,
+                                        ndev)) {
+                                dev_err(emac_dev,
+                                        "DaVinci EMAC: request_irq() failed\n");
+                                ret = -EBUSY;
 
-        while ((res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, k))) {
-                for (i = res->start; i <= res->end; i++) {
-                        if (request_irq(i, emac_irq, 0, ndev->name, ndev))
                                 goto rollback;
+                        }
                 }
-                k++;
+                res_num++;
         }
+        /* prepare counters for rollback in case of an error */
+        res_num--;
+        irq_num--;
 
         /* Start/Enable EMAC hardware */
         emac_hw_enable(priv);
@@ -1638,19 +1648,23 @@ static int emac_dev_open(struct net_device *ndev)
 
         return 0;
 
-rollback:
-
-        dev_err(emac_dev, "DaVinci EMAC: request_irq() failed");
+err:
+        emac_int_disable(priv);
+        napi_disable(&priv->napi);
 
-        for (q = k; k >= 0; k--) {
-                for (m = i; m >= res->start; m--)
+rollback:
+        for (q = res_num; q >= 0; q--) {
+                res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, q);
+                /* at the first iteration, irq_num is already set to the
+                 * right value
+                 */
+                if (q != res_num)
+                        irq_num = res->end;
+
+                for (m = irq_num; m >= res->start; m--)
                         free_irq(m, ndev);
-                res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, k-1);
-                m = res->end;
         }
-
-        ret = -EBUSY;
-err:
+        cpdma_ctlr_stop(priv->dma);
         pm_runtime_put(&priv->pdev->dev);
         return ret;
 }