netxen: Fix a panic during driver unload in device_remove_file
authorRajesh Borundia <rajesh.borundia@qlogic.com>
Fri, 3 Feb 2012 11:35:14 +0000 (11:35 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 4 Feb 2012 20:59:29 +0000 (15:59 -0500)
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>
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c

index f517c16bfa3fecc9d62d0858cdf3c14545d10aed..8dc4a134dece76ccc24721faf45c25c577a6fe2f 100644 (file)
@@ -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);