---

yaml --- r: 264256 b: refs/heads/master c: 95de86c h: refs/heads/master v: v3
git-mirror · Sep 29, 2011 · f445130 · f445130
1 parent 4f6ad57
commit f445130
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 676a1184e8afd4fed7948232df1ff91517400859
+refs/heads/master: 95de86cf5162f78bc5aea80d1a9e5a248196ffaf
diff --git a/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c
@@ -636,8 +636,8 @@ static int ibmveth_open(struct net_device *netdev)
 		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;
 	}