X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=drivers%2Fnet%2Fethernet%2Fibm%2Fibmvnic.c;h=5f44c5520fbc86bd9076cc220906e0a4cdee4e90;hb=8bf371e6adff29758cc3c57c17df4486513081f8;hp=0459d19a5f163f49e1a7b0ea1a95778cf4b54832;hpb=4c96f5b19c770a72fc7b51945ef4a48c48600aaf;p=cascardo%2Flinux.git

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 0459d19a5f16..5f44c5520fbc 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;
 }
@@ -3238,7 +3240,7 @@ static void ibmvnic_xport_event(struct work_struct *work)
 						       struct ibmvnic_adapter,
 						       ibmvnic_xport);
 	struct device *dev = &adapter->vdev->dev;
-	int rc;
+	long rc;
 
 	ibmvnic_free_inflight(adapter);
 	release_sub_crqs(adapter);