Merge branch 'master' of git://git.denx.de/u-boot-coldfire

[u-boot] / drivers / mtd / cfi_flash.c

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 3a8f8e42e267425aa20d71a58cfbbe4f82147440..bdfad98244475b4b3560924815b49a2d66f9f589 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -1622,7 +1622,7 @@ static int flash_detect_legacy(phys_addr_t base, int banknum)
                                info->vendor = modes[i];
                                info->start[0] =
                                        (ulong)map_physmem(base,
-                                                          info->portwith,
+                                                          info->portwidth,
                                                           MAP_NOCACHE);
                                if (info->portwidth == FLASH_CFI_8BIT
                                        && info->interface == FLASH_CFI_X8X16) {
@@ -1640,7 +1640,7 @@ static int flash_detect_legacy(phys_addr_t base, int banknum)
                                if (jedec_flash_match(info, info->start[0]))
                                        break;
                                else
-                                       unmap_physmem(info->start[0],
+                                       unmap_physmem((void *)info->start[0],
                                                      MAP_NOCACHE);
                        }
                }