From f6d5544e937d50d8f978e32282306eed3946c0ce Mon Sep 17 00:00:00 2001
From: Rasesh Mody <rmody@brocade.com>
Date: Tue, 30 Aug 2011 15:27:38 +0000
Subject: [PATCH] --- yaml --- r: 265727 b: refs/heads/master c:
 0caa9aaec515268ec13b0939bfb7e32cf5a31a55 h: refs/heads/master i:   265725:
 2341f4a6d3b33c82247460cd3a1f809115fc5e1e   265723:
 3bb26046ff2fa5303fdcc1e3ef9c2806c14e00f5   265719:
 083fcd7582c31526af9ef69d5ba7f3daf1665995   265711:
 dfcf57a1c1707da2be5deeee931b42e6a886c1b1   265695:
 ae49627391fd4835e6dd3a55b850c206a07407c9   265663:
 1333c527cdf9b4c180bcc26b391b330524b65f7b   265599:
 64cc843d7257ee02ca927a644562452a75e43b8e   265471:
 771a27707552047ac97519729e20d0b85a727781   265215:
 cc8580b9643e3bfbac955a6ad4433ee999fc0924 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/ethernet/brocade/bna/bnad.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1f9e2bd554b4..c7c5ea754e66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 772b5235d86563b00786030d9f42af3a89fd0833
+refs/heads/master: 0caa9aaec515268ec13b0939bfb7e32cf5a31a55
diff --git a/trunk/drivers/net/ethernet/brocade/bna/bnad.c b/trunk/drivers/net/ethernet/brocade/bna/bnad.c
index 1f4269c4c9c5..939abd45c0a4 100644
--- a/trunk/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/trunk/drivers/net/ethernet/brocade/bna/bnad.c
@@ -3253,8 +3253,10 @@ bnad_pci_probe(struct pci_dev *pdev,
 	spin_unlock_irqrestore(&bnad->bna_lock, flags);
 
 	err = bnad_res_alloc(bnad, &bnad->mod_res_info[0], BNA_MOD_RES_T_MAX);
-	if (err)
+	if (err) {
+		err = -EIO;
 		goto disable_ioceth;
+	}
 
 	spin_lock_irqsave(&bnad->bna_lock, flags);
 	bna_mod_init(&bnad->bna, &bnad->mod_res_info[0]);
@@ -3266,6 +3268,8 @@ bnad_pci_probe(struct pci_dev *pdev,
 	bnad_set_netdev_perm_addr(bnad);
 	spin_unlock_irqrestore(&bnad->bna_lock, flags);
 
+	mutex_unlock(&bnad->conf_mutex);
+
 	/* Finally, reguister with net_device layer */
 	err = register_netdev(netdev);
 	if (err) {
@@ -3274,6 +3278,8 @@ bnad_pci_probe(struct pci_dev *pdev,
 	}
 	set_bit(BNAD_RF_NETDEV_REGISTERED, &bnad->run_flags);
 
+	return 0;
+
 probe_success:
 	mutex_unlock(&bnad->conf_mutex);
 	return 0;