Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5858ad8d authored by Thomas Falcon's avatar Thomas Falcon Committed by Greg Kroah-Hartman
Browse files

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: ea22d51a ("ibmvnic: simplify and improve driver probe function")
Signed-off-by: default avatarThomas Falcon <tlfalcon@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 685d55c5

drivers/net/ethernet/ibm/ibmvnic.c

+1 −1
Original line number Diff line number Diff line
@@ -2926,7 +2926,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;