ibmvnic: Fix non-fatal firmware error reset

It is not necessary to disable interrupt lines here during a reset
to handle a non-fatal firmware error. Move that call within the code
block that handles the other cases that do require interrupts to be
disabled and re-enabled.

Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 9e08917cda1f991011cec8743e5fdea5f1059101..1b9c22f28fbfe1422bf120f7d040ed059da10ed7 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1822,9 +1822,8 @@ static int do_reset(struct ibmvnic_adapter *adapter,
                        if (rc)
                                return rc;
                }
                        if (rc)
                                return rc;
                }

+               ibmvnic_disable_irqs(adapter);

        }
        }

-
-       ibmvnic_disable_irqs(adapter);

        adapter->state = VNIC_CLOSED;
 
        if (reset_state == VNIC_CLOSED)
        adapter->state = VNIC_CLOSED;
 
        if (reset_state == VNIC_CLOSED)