]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
ibmvnic: Fix IRQ mapping disposal in error path
authorThomas Falcon <tlfalcon@linux.ibm.com>
Wed, 29 Jul 2020 21:36:32 +0000 (16:36 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Jul 2020 22:35:55 +0000 (15:35 -0700)
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>
drivers/net/ethernet/ibm/ibmvnic.c

index 0fd7eae25fe9d6f211549edf8eee0867aa7cfacf..5afb3c9c52d20a44d1cef41b0b1465e51269e9fe 100644 (file)
@@ -3206,7 +3206,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;