From 460ed2895231dca05a7b84174ca9b9634fb65d35 Mon Sep 17 00:00:00 2001
From: Sony Chacko <sony.chacko@qlogic.com>
Date: Sat, 24 Jul 2010 18:32:18 +0000
Subject: [PATCH] --- yaml --- r: 203746 b: refs/heads/master c:
 57e46248a71bfcafb3937a7a5ed8ad324c9fc4f0 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/qlcnic/qlcnic_main.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fb0ba6f6acd6..9ccc0a38219c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36a1898ddfde3e36a6813ac72540e011a3de57ae
+refs/heads/master: 57e46248a71bfcafb3937a7a5ed8ad324c9fc4f0
diff --git a/trunk/drivers/net/qlcnic/qlcnic_main.c b/trunk/drivers/net/qlcnic/qlcnic_main.c
index f147958e05a1..b9615bd745ea 100644
--- a/trunk/drivers/net/qlcnic/qlcnic_main.c
+++ b/trunk/drivers/net/qlcnic/qlcnic_main.c
@@ -1176,6 +1176,7 @@ int qlcnic_diag_alloc_res(struct net_device *netdev, int test)
 	ret = qlcnic_fw_create_ctx(adapter);
 	if (ret) {
 		qlcnic_detach(adapter);
+		netif_device_attach(netdev);
 		return ret;
 	}