From: Thomas Falcon Date: Wed, 16 May 2018 20:49:04 +0000 (-0500) Subject: ibmvnic: Fix non-fatal firmware error reset X-Git-Tag: v5.15~8822^2~11^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=134bbe7f21f4455c8be64f945b8b67094f768de0;p=platform%2Fkernel%2Flinux-starfive.git 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 Signed-off-by: David S. Miller --- 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)