Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 43c390b751ba49916c65308c582ae3f997148efe

Authored by Thomas Falcon
Committed by Greg Kroah-Hartman
1 parent ea559138b3

ibmvnic: Fix IRQ mapping disposal in error path 

[ 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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/net/ethernet/ibm/ibmvnic.c
Diff comments   View file @ 43c390b
... ... @@ -3086,7 +3086,7 @@
3086 3086 req_tx_irq_failed:
3087 3087 for (j = 0; j < i; j++) {
3088 3088 free_irq(adapter->tx_scrq[j]->irq, adapter->tx_scrq[j]);
3089   - irq_dispose_mapping(adapter->rx_scrq[j]->irq);
  3089 + irq_dispose_mapping(adapter->tx_scrq[j]->irq);
3090 3090 }
3091 3091 release_sub_crqs(adapter, 1);
3092 3092 return rc;