Commit a69e89ba authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/endpoint' 

- Fix alignment fault error in copy tests (Hou Zhiqiang)

- Fix misused goto label (Li Chen)

* remotes/lorenzo/pci/endpoint:
  PCI: endpoint: Fix misused goto label
  PCI: endpoint: Fix alignment fault error in copy tests
parents 0321da85 bf8d87c0

drivers/pci/endpoint/functions/pci-epf-test.c

+12 −2
Original line number Diff line number Diff line
@@ -285,7 +285,17 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test) 
		if (ret)

			dev_err(dev, "Data transfer failed\n");

	} else {

		memcpy(dst_addr, src_addr, reg->size);

		void *buf;



		buf = kzalloc(reg->size, GFP_KERNEL);

		if (!buf) {

			ret = -ENOMEM;

			goto err_map_addr;

		}



		memcpy_fromio(buf, src_addr, reg->size);

		memcpy_toio(dst_addr, buf, reg->size);

		kfree(buf);

	}

	ktime_get_ts64(&end);

	pci_epf_test_print_rate("COPY", reg->size, &start, &end, use_dma);
@@ -441,7 +451,7 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test) 
		if (!epf_test->dma_supported) {

			dev_err(dev, "Cannot transfer data using DMA\n");

			ret = -EINVAL;

			goto err_map_addr;

			goto err_dma_map;

		}



		src_phys_addr = dma_map_single(dma_dev, buf, reg->size,