| From b79125da58853ef4af0d88f0a9d5301a7fdb4abe Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 29 Jul 2020 16:36:32 -0500 |
| Subject: ibmvnic: Fix IRQ mapping disposal in error path |
| |
| From: Thomas Falcon <tlfalcon@linux.ibm.com> |
| |
| [ Upstream commit 27a2145d6f826d1fad9de06ac541b1016ced3427 ] |
| |
| 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: ea22d51a7831 ("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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/ibm/ibmvnic.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c |
| index 5e9e45befc875..d8115a9333e05 100644 |
| --- a/drivers/net/ethernet/ibm/ibmvnic.c |
| +++ b/drivers/net/ethernet/ibm/ibmvnic.c |
| @@ -2926,7 +2926,7 @@ req_rx_irq_failed: |
| 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; |
| -- |
| 2.25.1 |
| |
