From: Rajesh Borundia <rajesh.borundia@qlogic.com>
To: David Miller <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
Ameen Rahman <ameen.rahman@qlogic.com>,
Sony Chacko <sony.chacko@qlogic.com>, <stable@kernel.org>
Subject: [PATCH NEXT 5/6] netxen: Fix a panic during driver unload in device_remove_file
Date: Fri, 3 Feb 2012 13:35:14 -0800 [thread overview]
Message-ID: <1328304915-12858-6-git-send-email-rajesh.borundia@qlogic.com> (raw)
In-Reply-To: <1328304915-12858-1-git-send-email-rajesh.borundia@qlogic.com>
o Pass adapter->pdev->dev instead of netdev->dev
Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
---
.../net/ethernet/qlogic/netxen/netxen_nic_main.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index f517c16..8dc4a134 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -2930,13 +2930,12 @@ static struct bin_attribute bin_attr_mem = {
static void
netxen_create_sysfs_entries(struct netxen_adapter *adapter)
{
- struct net_device *netdev = adapter->netdev;
- struct device *dev = &netdev->dev;
+ struct device *dev = &adapter->pdev->dev;
if (adapter->capabilities & NX_FW_CAPABILITY_BDG) {
/* bridged_mode control */
if (device_create_file(dev, &dev_attr_bridged_mode)) {
- dev_warn(&netdev->dev,
+ dev_warn(dev,
"failed to create bridged_mode sysfs entry\n");
}
}
@@ -2945,8 +2944,7 @@ netxen_create_sysfs_entries(struct netxen_adapter *adapter)
static void
netxen_remove_sysfs_entries(struct netxen_adapter *adapter)
{
- struct net_device *netdev = adapter->netdev;
- struct device *dev = &netdev->dev;
+ struct device *dev = &adapter->pdev->dev;
if (adapter->capabilities & NX_FW_CAPABILITY_BDG)
device_remove_file(dev, &dev_attr_bridged_mode);
--
1.7.3.3
next prev parent reply other threads:[~2012-02-03 21:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-03 21:35 [PATCH 0/6] netxen: Fixes Rajesh Borundia
2012-02-03 21:35 ` [PATCH NEXT 1/6] netxen_nic: fix cdrp race condition Rajesh Borundia
2012-02-03 21:35 ` [PATCH NEXT 2/6] netxen_nic: fw dump support Rajesh Borundia
2012-02-03 21:35 ` [PATCH NEXT 3/6] netxen_nic: Fix phy link status Rajesh Borundia
2012-02-03 21:35 ` [PATCH NEXT 4/6] netxen_nic: Error logging on firmware hang Rajesh Borundia
2012-02-03 21:35 ` Rajesh Borundia [this message]
2012-02-03 21:35 ` [PATCH NEXT 6/6] netxen: report valid speed and duplex status when link is down Rajesh Borundia
2012-02-04 21:04 ` [PATCH 0/6] netxen: Fixes David Miller
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=1328304915-12858-6-git-send-email-rajesh.borundia@qlogic.com \
--to=rajesh.borundia@qlogic.com \
--cc=ameen.rahman@qlogic.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sony.chacko@qlogic.com \
--cc=stable@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).