Message ID | 1477589332-513-2-git-send-email-tlfalcon@linux.vnet.ibm.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> Date: Thu, 27 Oct 2016 12:28:52 -0500 > Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> > --- > v1: caught by kbuild bot with -Wmisleading-indentation after > after submitting previous patch Applied.
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index a922fb9..5f44c55 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1461,14 +1461,16 @@ static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter) return rc; req_rx_irq_failed: - for (j = 0; j < i; j++) + for (j = 0; j < i; j++) { free_irq(adapter->rx_scrq[j]->irq, adapter->rx_scrq[j]); irq_dispose_mapping(adapter->rx_scrq[j]->irq); + } i = adapter->req_tx_queues; req_tx_irq_failed: - for (j = 0; j < i; j++) + 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); + } release_sub_crqs_no_irqs(adapter); return rc; }
Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> --- v1: caught by kbuild bot with -Wmisleading-indentation after after submitting previous patch --- drivers/net/ethernet/ibm/ibmvnic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)