commit 88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9
author David S. Miller <davem@davemloft.net> Fri Oct 07 13:38:43 2011 -0400
committer David S. Miller <davem@davemloft.net> Fri Oct 07 13:38:43 2011 -0400
tree 08c4399e0341f7eb0ccb24e15f2cab687275c2a4
parent 8083f0fc969d9b5353061a7a6f963405057e26b1
parent 3ee72ca99288f1de95ec9c570e43f531c8799f06

Merge branch 'master' of github.com:davem330/net

Conflicts:
	net/batman-adv/soft-interface.c

drivers/net/ethernet/ibm/ibmveth.c

diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index 72b84de..4da972e 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -636,8 +636,8 @@
 		netdev_err(netdev, "unable to request irq 0x%x, rc %d\n",
 			   netdev->irq, rc);
 		do {
-			rc = h_free_logical_lan(adapter->vdev->unit_address);
-		} while (H_IS_LONG_BUSY(rc) || (rc == H_BUSY));
+			lpar_rc = h_free_logical_lan(adapter->vdev->unit_address);
+		} while (H_IS_LONG_BUSY(lpar_rc) || (lpar_rc == H_BUSY));
 
 		goto err_out;
 	}