diff options
| author | Thomas Falcon <tlfalcon@linux.vnet.ibm.com> | 2018-05-16 22:49:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-17 20:57:19 +0200 |
| commit | 134bbe7f21f4455c8be64f945b8b67094f768de0 (patch) | |
| tree | 754e6e5240e86bea94ab817797159b0239b230da /drivers/net | |
| parent | ibmvnic: Free coherent DMA memory if FW map failed (diff) | |
| download | linux-134bbe7f21f4455c8be64f945b8b67094f768de0.tar.xz linux-134bbe7f21f4455c8be64f945b8b67094f768de0.zip | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 9e08917cda1f..1b9c22f28fbf 100644 --- 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; } + ibmvnic_disable_irqs(adapter); } - - ibmvnic_disable_irqs(adapter); adapter->state = VNIC_CLOSED; if (reset_state == VNIC_CLOSED) |