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/amd/ntb_hw_amd.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/amd/ntb_hw_amd.c')
| -rw-r--r-- | drivers/ntb/hw/amd/ntb_hw_amd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c index 04550b1f984c..855ff65f64a5 100644 --- a/drivers/ntb/hw/amd/ntb_hw_amd.c +++ b/drivers/ntb/hw/amd/ntb_hw_amd.c @@ -1194,7 +1194,6 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev, return 0; err_dma_mask: - pci_clear_master(pdev); pci_release_regions(pdev); err_pci_regions: pci_disable_device(pdev); @@ -1209,7 +1208,6 @@ static void amd_ntb_deinit_pci(struct amd_ntb_dev *ndev) pci_iounmap(pdev, ndev->self_mmio); - pci_clear_master(pdev); pci_release_regions(pdev); pci_disable_device(pdev); pci_set_drvdata(pdev, NULL); @@ -1338,12 +1336,17 @@ static struct pci_driver amd_ntb_pci_driver = { static int __init amd_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(&amd_ntb_pci_driver); + ret = pci_register_driver(&amd_ntb_pci_driver); + if (ret) + debugfs_remove_recursive(debugfs_dir); + + return ret; } module_init(amd_ntb_pci_driver_init); |