summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/pcie/drv.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-08-22 14:15:47 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-08-22 14:15:47 -0400
commit6de3f7e911d27d6737c79b3f6b5069044ea408ec (patch)
tree186dcf1897be76a4155f5a22a7f242c29f328c5a /drivers/net/wireless/iwlwifi/pcie/drv.c
parent33dd7699cefd175c3a5d3d6077db9c8d8322c9a7 (diff)
parent40503f7b48260a91ab65a4f8b00a2c6f004fa807 (diff)
downloadtalos-op-linux-6de3f7e911d27d6737c79b3f6b5069044ea408ec.tar.gz
talos-op-linux-6de3f7e911d27d6737c79b3f6b5069044ea408ec.zip
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/drv.c')
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/drv.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c
index f4c3500b68c6..89bfb43f4946 100644
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@ -282,8 +282,14 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (!trans_pcie->drv)
goto out_free_trans;
+ /* register transport layer debugfs here */
+ if (iwl_trans_dbgfs_register(iwl_trans, iwl_trans->dbgfs_dir))
+ goto out_free_drv;
+
return 0;
+out_free_drv:
+ iwl_drv_stop(trans_pcie->drv);
out_free_trans:
iwl_trans_pcie_free(iwl_trans);
pci_set_drvdata(pdev, NULL);
OpenPOWER on IntegriCloud