Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xtensa...

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / nand / nandsim.c

diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 4f0d83648e5a5ad9f5f0260e21b01067f81099be..7dc1dd28d896ca5e532ded77a6b4e8a25b044e5c 100644 (file)
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -827,7 +827,7 @@ static int parse_badblocks(struct nandsim *ns, struct mtd_info *mtd)
                        NS_ERR("invalid badblocks.\n");
                        return -EINVAL;
                }
-               offset = erase_block_no * ns->geom.secsz;
+               offset = (loff_t)erase_block_no * ns->geom.secsz;
                if (mtd_block_markbad(mtd, offset)) {
                        NS_ERR("invalid badblocks.\n");
                        return -EINVAL;