|
@@ -280,15 +280,16 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
|
|
|
return NULL;
|
|
|
area->phys_addr = phys_addr;
|
|
|
vaddr = (unsigned long) area->addr;
|
|
|
- if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {
|
|
|
+
|
|
|
+ if (kernel_map_sync_memtype(phys_addr, size, prot_val)) {
|
|
|
free_memtype(phys_addr, phys_addr + size);
|
|
|
free_vm_area(area);
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
- if (ioremap_change_attr(vaddr, size, prot_val) < 0) {
|
|
|
+ if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {
|
|
|
free_memtype(phys_addr, phys_addr + size);
|
|
|
- vunmap(area->addr);
|
|
|
+ free_vm_area(area);
|
|
|
return NULL;
|
|
|
}
|
|
|
|