diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-05-18 11:49:45 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-05-18 11:49:45 +1000 |
| commit | e5c7b38d88e3a9f41479bae0b2fb941bdd7da50f (patch) | |
| tree | 85c1833ba3d79cc50a09c3c98a9b553349507ec3 /drivers/ntb/hw/intel/ntb_hw_gen1.c | |
| parent | 9bdc0fb5e195860cd4b1bd1a2e5371b74040f057 (diff) | |
| parent | 942cc9ceccb6178b56bf712b94d76190d8759823 (diff) | |
| download | linux-next-e5c7b38d88e3a9f41479bae0b2fb941bdd7da50f.tar.gz | |
Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git
Diffstat (limited to 'drivers/ntb/hw/intel/ntb_hw_gen1.c')
| -rw-r--r-- | drivers/ntb/hw/intel/ntb_hw_gen1.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/ntb/hw/intel/ntb_hw_gen1.c b/drivers/ntb/hw/intel/ntb_hw_gen1.c index 84772013812b..9ab836d0d4f1 100644 --- a/drivers/ntb/hw/intel/ntb_hw_gen1.c +++ b/drivers/ntb/hw/intel/ntb_hw_gen1.c @@ -1791,7 +1791,6 @@ static int intel_ntb_init_pci(struct intel_ntb_dev *ndev, struct pci_dev *pdev) err_mmio: err_dma_mask: - pci_clear_master(pdev); pci_release_regions(pdev); err_pci_regions: pci_disable_device(pdev); @@ -1808,7 +1807,6 @@ static void intel_ntb_deinit_pci(struct intel_ntb_dev *ndev) pci_iounmap(pdev, ndev->peer_mmio); pci_iounmap(pdev, ndev->self_mmio); - pci_clear_master(pdev); pci_release_regions(pdev); pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); @@ -2064,12 +2062,17 @@ static struct pci_driver intel_ntb_pci_driver = { static int __init intel_ntb_pci_driver_init(void) { + int ret; pr_info("%s %s\n", NTB_DESC, NTB_VER); if (debugfs_initialized()) debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL); - return pci_register_driver(&intel_ntb_pci_driver); + ret = pci_register_driver(&intel_ntb_pci_driver); + if (ret) + debugfs_remove_recursive(debugfs_dir); + + return ret; } module_init(intel_ntb_pci_driver_init); |