Commit 454f4de2 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/endpoint' 

  - Fix endpoint driver sign extension problem when shifting page number to
    phys_addr_t (Alan Mikhak)

* remotes/lorenzo/pci/endpoint:
  PCI: endpoint: Cast the page number to phys_addr_t
parents d76d273d daee4f4e

drivers/pci/endpoint/pci-epc-mem.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ void __iomem *pci_epc_mem_alloc_addr(struct pci_epc *epc, 
	if (pageno < 0)

		return NULL;



	*phys_addr = mem->phys_base + (pageno << page_shift);

	*phys_addr = mem->phys_base + ((phys_addr_t)pageno << page_shift);

	virt_addr = ioremap(*phys_addr, size);

	if (!virt_addr)

		bitmap_release_region(mem->bitmap, pageno, order);