ibmvnic: Fix IRQ mapping disposal in error path

tlfalcon · davem330 · commit 27a2145d6f82 · 2020-07-29T15:35:55.000-07:00
RX queue IRQ mappings are disposed in both the TX IRQ and RX IRQ error paths. Fix this and dispose of TX IRQ mappings correctly in case of an error. Fixes: ea22d51 ("ibmvnic: simplify and improve driver probe function") Signed-off-by: Thomas Falcon <tlfalcon@linux.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
@@ -3206,7 +3206,7 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter)
 req_tx_irq_failed:
 	for (j = 0; j < i; j++) {
 		free_irq(adapter->tx_scrq[j]->irq, adapter->tx_scrq[j]);
-		irq_dispose_mapping(adapter->rx_scrq[j]->irq);
+		irq_dispose_mapping(adapter->tx_scrq[j]->irq);
 	}
 	release_sub_crqs(adapter, 1);
 	return rc;

Original file line number	Diff line number	Diff line change
`@@ -3206,7 +3206,7 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter)`
`3206`	`3206`	`req_tx_irq_failed:`
`3207`	`3207`	`for (j = 0; j < i; j++) {`
`3208`	`3208`	`free_irq(adapter->tx_scrq[j]->irq, adapter->tx_scrq[j]);`
`3209`		`- irq_dispose_mapping(adapter->rx_scrq[j]->irq);`
	`3209`	`+ irq_dispose_mapping(adapter->tx_scrq[j]->irq);`
`3210`	`3210`	`}`
`3211`	`3211`	`release_sub_crqs(adapter, 1);`
`3212`	`3212`	`return rc;`