Merge tag 'ntb-5.10' of git://github.com/jonmason/ntb (e5acf0ed) · Commits · 戴 / test

drivers/ntb/hw/amd/ntb_hw_amd.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1203,6 +1203,7 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev,

		err_dma_mask:
		pci_clear_master(pdev);
		pci_release_regions(pdev);
		err_pci_regions:
		pci_disable_device(pdev);
		err_pci_enable:

+1 −1

Original line number	Diff line number	Diff line
		@@ -1893,7 +1893,7 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev,
		goto err_init_dev;
		} else {
		rc = -EINVAL;
		goto err_ndev;
		goto err_init_pci;
		}

		ndev_reset_unsafe_flags(ndev);

+1 −4

Original line number	Diff line number	Diff line
		@@ -319,7 +319,6 @@ static void ntb_msit_remove_dbgfs(struct ntb_msit_ctx *nm)
		static int ntb_msit_probe(struct ntb_client client, struct ntb_dev ntb)
		{
		struct ntb_msit_ctx *nm;
		size_t struct_size;
		int peers;
		int ret;

		@@ -352,9 +351,7 @@ static int ntb_msit_probe(struct ntb_client client, struct ntb_dev ntb)
		return ret;
		}

		struct_size = sizeof(nm) + sizeof(nm->peers) * peers;

		nm = devm_kzalloc(&ntb->dev, struct_size, GFP_KERNEL);
		nm = devm_kzalloc(&ntb->dev, struct_size(nm, peers, peers), GFP_KERNEL);
		if (!nm)
		return -ENOMEM;