From: Rasesh Mody <rmody@brocade.com>
To: <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: <adapter_linux_open_src_team@brocade.com>,
Rasesh Mody <rmody@brocade.com>,
Gurunatha Karaje <gkaraje@brocade.com>
Subject: [net-next,v4 02/12] bna: PCI Probe Fix
Date: Tue, 23 Aug 2011 10:55:58 -0700 [thread overview]
Message-ID: <1314122168-14314-3-git-send-email-rmody@brocade.com> (raw)
In-Reply-To: <1314122168-14314-1-git-send-email-rmody@brocade.com>
Change details:
- Return error as -EIO if bnad_res_alloc fails
- Release the configuration lock before registering with net_device layer.
Signed-off-by: Gurunatha Karaje <gkaraje@brocade.com>
Signed-off-by: Rasesh Mody <rmody@brocade.com>
---
drivers/net/ethernet/brocade/bna/bnad.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index d18ffb3..3f19a4d 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/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;
--
1.7.1
next prev parent reply other threads:[~2011-08-23 17:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-23 17:55 [net-next,v4 00/12] bna: Update bna driver version to 3.0.2.1 Rasesh Mody
2011-08-23 17:55 ` [net-next,v4 01/12] bna: Naming Change and Minor Macro Fix Rasesh Mody
2011-08-23 17:55 ` Rasesh Mody [this message]
2011-08-23 17:55 ` [net-next,v4 03/12] bna: Interrupt Polling and NAPI Init Changes Rasesh Mody
2011-08-23 17:56 ` [net-next,v4 04/12] bna: TX Path and RX Path Changes Rasesh Mody
2011-08-23 23:22 ` David Miller
2011-08-23 23:24 ` David Miller
2011-08-23 17:56 ` [net-next,v4 05/12] bna: Formatting and Code Cleanup Rasesh Mody
2011-08-23 17:56 ` [net-next,v4 06/12] bna: Initialization and Locking Fix Rasesh Mody
2011-08-23 17:56 ` [net-next,v4 07/12] bna: Ethtool Enhancements and Fix Rasesh Mody
2011-08-23 17:56 ` [net-next,v4 08/12] bna: Async Mode Tx Rx Init Fix Rasesh Mody
2011-08-23 17:56 ` [net-next,v4 09/12] bna: MBOX IRQ Flag Check after Locking Rasesh Mody
2011-08-23 17:56 ` [net-next,v4 10/12] bna: Queue Depth and SKB Unmap Array Fix Rasesh Mody
2011-08-23 17:56 ` [net-next,v4 11/12] bna: SKB PCI UNMAP Fix Rasesh Mody
2011-08-23 17:56 ` [net-next,v4 12/12] bna: Driver Version changed to 3.0.2.1 Rasesh Mody
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314122168-14314-3-git-send-email-rmody@brocade.com \
--to=rmody@brocade.com \
--cc=adapter_linux_open_src_team@brocade.com \
--cc=davem@davemloft.net \
--cc=gkaraje@brocade.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).