1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c
index e538c0a72abb..490b4742ce3a 100644
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
@@ -156,7 +156,7 @@ static int scan_header(struct partition *part)
         size_t retlen;
 
         sectors_per_block = part->block_size / SECTOR_SIZE;
-        part->total_blocks = part->mbd.mtd->size / part->block_size;
+        part->total_blocks = (u32)part->mbd.mtd->size / part->block_size;
 
         if (part->total_blocks < 2)
                 return -ENOENT;
@@ -276,16 +276,17 @@ static void erase_callback(struct erase_info *erase)
 
         part = (struct partition*)erase->priv;
 
-        i = erase->addr / part->block_size;
-        if (i >= part->total_blocks || part->blocks[i].offset != erase->addr) {
-                printk(KERN_ERR PREFIX "erase callback for unknown offset %x "
-                                "on '%s'\n", erase->addr, part->mbd.mtd->name);
+        i = (u32)erase->addr / part->block_size;
+        if (i >= part->total_blocks || part->blocks[i].offset != erase->addr ||
+            erase->addr > UINT_MAX) {
+                printk(KERN_ERR PREFIX "erase callback for unknown offset %llx "
+                                "on '%s'\n", (unsigned long long)erase->addr, part->mbd.mtd->name);
                 return;
         }
 
         if (erase->state != MTD_ERASE_DONE) {
-                printk(KERN_WARNING PREFIX "erase failed at 0x%x on '%s', "
-                                "state %d\n", erase->addr,
+                printk(KERN_WARNING PREFIX "erase failed at 0x%llx on '%s', "
+                                "state %d\n", (unsigned long long)erase->addr,
                                 part->mbd.mtd->name, erase->state);
 
                 part->blocks[i].state = BLOCK_FAILED;
@@ -345,9 +346,9 @@ static int erase_block(struct partition *part, int block)
         rc = part->mbd.mtd->erase(part->mbd.mtd, erase);
 
         if (rc) {
-                printk(KERN_ERR PREFIX "erase of region %x,%x on '%s' "
-                                "failed\n", erase->addr, erase->len,
-                                part->mbd.mtd->name);
+                printk(KERN_ERR PREFIX "erase of region %llx,%llx on '%s' "
+                                "failed\n", (unsigned long long)erase->addr,
+                                (unsigned long long)erase->len, part->mbd.mtd->name);
                 kfree(erase);
         }
 
@@ -763,7 +764,7 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 {
         struct partition *part;
 
-        if (mtd->type != MTD_NORFLASH)
+        if (mtd->type != MTD_NORFLASH || mtd->size > UINT_MAX)
                 return;
 
         part = kzalloc(sizeof(struct partition), GFP_KERNEL);