lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netxen: Fix a panic during driver unload in device_remove_file

Browse Source 
o Pass adapter->pdev->dev instead of netdev->dev

Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rajesh Borundia
2012-02-03 11:35:14 +00:00
committed by David S. Miller
parent 5471aed025
commit b8c30812b4
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
View File

@@ -2930,13 +2930,12 @@ static struct bin_attribute bin_attr_mem = {
static void static void
netxen_create_sysfs_entries(struct netxen_adapter *adapter) netxen_create_sysfs_entries(struct netxen_adapter *adapter)
{ {
struct net_device *netdev = adapter->netdev; struct device *dev = &adapter->pdev->dev;
struct device *dev = &netdev->dev;
if (adapter->capabilities & NX_FW_CAPABILITY_BDG) { if (adapter->capabilities & NX_FW_CAPABILITY_BDG) {
/* bridged_mode control */ /* bridged_mode control */
if (device_create_file(dev, &dev_attr_bridged_mode)) { if (device_create_file(dev, &dev_attr_bridged_mode)) {
dev_warn(&netdev->dev, dev_warn(dev,
"failed to create bridged_mode sysfs entry\n"); "failed to create bridged_mode sysfs entry\n");
} }
} }
@@ -2945,8 +2944,7 @@ netxen_create_sysfs_entries(struct netxen_adapter *adapter)
static void static void
netxen_remove_sysfs_entries(struct netxen_adapter *adapter) netxen_remove_sysfs_entries(struct netxen_adapter *adapter)
{ {
struct net_device *netdev = adapter->netdev; struct device *dev = &adapter->pdev->dev;
struct device *dev = &netdev->dev;
if (adapter->capabilities & NX_FW_CAPABILITY_BDG) if (adapter->capabilities & NX_FW_CAPABILITY_BDG)
device_remove_file(dev, &dev_attr_bridged_mode); device_remove_file(dev, &dev_attr_bridged_mode);