From 3e9b95ba44dfb2417c3389af66298577a7db1989 Mon Sep 17 00:00:00 2001
From: Roland Dreier <rolandd@cisco.com>
Date: Tue, 29 Nov 2005 10:55:58 -0800
Subject: [PATCH] --- yaml --- r: 14908 b: refs/heads/master c:
 267ee88ed34c76dc527eeb3d95f9f9558ac99973 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5b33204a5b14..0ab39f79374a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f71055a45a503273c039d80db8ba9b13cb17549
+refs/heads/master: 267ee88ed34c76dc527eeb3d95f9f9558ac99973
diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 826d7a73ef84..475d98fa9e26 100644
--- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -94,8 +94,10 @@ int ipoib_open(struct net_device *dev)
 	if (ipoib_ib_dev_open(dev))
 		return -EINVAL;
 
-	if (ipoib_ib_dev_up(dev))
+	if (ipoib_ib_dev_up(dev)) {
+		ipoib_ib_dev_stop(dev);
 		return -EINVAL;
+	}
 
 	if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) {
 		struct ipoib_dev_priv *cpriv;