Skip to content

Commit

Permalink
ibmvnic: Fix non-fatal firmware error reset
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Falcon authored and David S. Miller committed May 17, 2018
1 parent 4cf2ddf commit 134bbe7
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/net/ethernet/ibm/ibmvnic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 134bbe7

Please sign in to comment.