Skip to content

Commit

Permalink
netxen: Fix a panic during driver unload in device_remove_file
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rajesh Borundia authored and David S. Miller committed Feb 4, 2012
1 parent 5471aed commit b8c3081
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
Expand All @@ -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);
Expand Down

0 comments on commit b8c3081

Please sign in to comment.