diff options
author | Abhijeet Kolekar <abhijeet.kolekar@intel.com> | 2009-04-20 17:36:58 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:57:18 -0400 |
commit | a75fbe8d68ceace836b27c216a5eda1c4687be4b (patch) | |
tree | 8ec48a15b8b5ec237b7021b486265fbdb0bedca7 | |
parent | b097ad29752f909ec1121ac3dc57d348f08dd8d7 (diff) |
iwl3945: add debugfs to 3945
Patch adds debugfs to 3945. Also fix debugfs registration in iwlagn
to return error code if it fails.
Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 12de63e9c720..2751736b0b64 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -2829,7 +2829,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2829 | 2829 | ||
2830 | err = iwl_dbgfs_register(priv, DRV_NAME); | 2830 | err = iwl_dbgfs_register(priv, DRV_NAME); |
2831 | if (err) | 2831 | if (err) |
2832 | IWL_ERR(priv, "failed to create debugfs files\n"); | 2832 | IWL_ERR(priv, "failed to create debugfs files. Ignoring error: %d\n", err); |
2833 | 2833 | ||
2834 | /* If platform's RF_KILL switch is NOT set to KILL */ | 2834 | /* If platform's RF_KILL switch is NOT set to KILL */ |
2835 | if (iwl_read32(priv, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW) | 2835 | if (iwl_read32(priv, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW) |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index c15d0cfb93bc..bcfe199567e6 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -4346,6 +4346,10 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e | |||
4346 | if (err) | 4346 | if (err) |
4347 | goto out_remove_sysfs; | 4347 | goto out_remove_sysfs; |
4348 | 4348 | ||
4349 | err = iwl_dbgfs_register(priv, DRV_NAME); | ||
4350 | if (err) | ||
4351 | IWL_ERR(priv, "failed to create debugfs files. Ignoring error: %d\n", err); | ||
4352 | |||
4349 | err = iwl_rfkill_init(priv); | 4353 | err = iwl_rfkill_init(priv); |
4350 | if (err) | 4354 | if (err) |
4351 | IWL_ERR(priv, "Unable to initialize RFKILL system. " | 4355 | IWL_ERR(priv, "Unable to initialize RFKILL system. " |
@@ -4396,6 +4400,8 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev) | |||
4396 | 4400 | ||
4397 | IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n"); | 4401 | IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n"); |
4398 | 4402 | ||
4403 | iwl_dbgfs_unregister(priv); | ||
4404 | |||
4399 | set_bit(STATUS_EXIT_PENDING, &priv->status); | 4405 | set_bit(STATUS_EXIT_PENDING, &priv->status); |
4400 | 4406 | ||
4401 | if (priv->mac80211_registered) { | 4407 | if (priv->mac80211_registered) { |