diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 4f6ed6942065..396940e701e5 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -8690,6 +8690,11 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e | |||
8690 | goto out_release_irq; | 8690 | goto out_release_irq; |
8691 | } | 8691 | } |
8692 | 8692 | ||
8693 | err = iwl_dbgfs_register(priv, DRV_NAME); | ||
8694 | if (err) { | ||
8695 | IWL_ERROR("failed to create debugfs files\n"); | ||
8696 | goto out_remove_sysfs; | ||
8697 | } | ||
8693 | /* nic init */ | 8698 | /* nic init */ |
8694 | iwl4965_set_bit(priv, CSR_GIO_CHICKEN_BITS, | 8699 | iwl4965_set_bit(priv, CSR_GIO_CHICKEN_BITS, |
8695 | CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER); | 8700 | CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER); |
@@ -8700,13 +8705,13 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e | |||
8700 | CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000); | 8705 | CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000); |
8701 | if (err < 0) { | 8706 | if (err < 0) { |
8702 | IWL_DEBUG_INFO("Failed to init the card\n"); | 8707 | IWL_DEBUG_INFO("Failed to init the card\n"); |
8703 | goto out_remove_sysfs; | 8708 | goto out_remove_dbgfs; |
8704 | } | 8709 | } |
8705 | /* Read the EEPROM */ | 8710 | /* Read the EEPROM */ |
8706 | err = iwl_eeprom_init(priv); | 8711 | err = iwl_eeprom_init(priv); |
8707 | if (err) { | 8712 | if (err) { |
8708 | IWL_ERROR("Unable to init EEPROM\n"); | 8713 | IWL_ERROR("Unable to init EEPROM\n"); |
8709 | goto out_remove_sysfs; | 8714 | goto out_remove_dbgfs; |
8710 | } | 8715 | } |
8711 | /* MAC Address location in EEPROM same for 3945/4965 */ | 8716 | /* MAC Address location in EEPROM same for 3945/4965 */ |
8712 | iwl_eeprom_get_mac(priv, priv->mac_addr); | 8717 | iwl_eeprom_get_mac(priv, priv->mac_addr); |
@@ -8716,7 +8721,7 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e | |||
8716 | err = iwl4965_init_channel_map(priv); | 8721 | err = iwl4965_init_channel_map(priv); |
8717 | if (err) { | 8722 | if (err) { |
8718 | IWL_ERROR("initializing regulatory failed: %d\n", err); | 8723 | IWL_ERROR("initializing regulatory failed: %d\n", err); |
8719 | goto out_remove_sysfs; | 8724 | goto out_remove_dbgfs; |
8720 | } | 8725 | } |
8721 | 8726 | ||
8722 | err = iwl4965_init_geos(priv); | 8727 | err = iwl4965_init_geos(priv); |
@@ -8743,6 +8748,8 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e | |||
8743 | iwl4965_free_geos(priv); | 8748 | iwl4965_free_geos(priv); |
8744 | out_free_channel_map: | 8749 | out_free_channel_map: |
8745 | iwl4965_free_channel_map(priv); | 8750 | iwl4965_free_channel_map(priv); |
8751 | out_remove_dbgfs: | ||
8752 | iwl_dbgfs_unregister(priv); | ||
8746 | out_remove_sysfs: | 8753 | out_remove_sysfs: |
8747 | sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group); | 8754 | sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group); |
8748 | 8755 | ||
@@ -8787,6 +8794,7 @@ static void iwl4965_pci_remove(struct pci_dev *pdev) | |||
8787 | } | 8794 | } |
8788 | } | 8795 | } |
8789 | 8796 | ||
8797 | iwl_dbgfs_unregister(priv); | ||
8790 | sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group); | 8798 | sysfs_remove_group(&pdev->dev.kobj, &iwl4965_attribute_group); |
8791 | 8799 | ||
8792 | iwl4965_dealloc_ucode_pci(priv); | 8800 | iwl4965_dealloc_ucode_pci(priv); |