ibmvnic: Fix non-fatal firmware error reset

tlfalcon · davem330 · commit 134bbe7f21f4 · 2018-05-17T14:57:19.000-04:00
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 &lt;tlfalcon@linux.vnet.ibm.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1822,9 +1822,8 @@ static int do_reset(struct ibmvnic_adapter *adapter,`
`1822`	`1822`	`if (rc)`
`1823`	`1823`	`return rc;`
`1824`	`1824`	`}`
	`1825`	`+ ibmvnic_disable_irqs(adapter);`
`1825`	`1826`	`}`
`1826`		`-`
`1827`		`- ibmvnic_disable_irqs(adapter);`
`1828`	`1827`	`adapter->state = VNIC_CLOSED;`
`1829`	`1828`
`1830`	`1829`	`if (reset_state == VNIC_CLOSED)`