diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-08 14:23:12 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-09 09:32:29 +0100 |
| commit | 81737c1d436add87e26a22dca9dd750b9655de01 (patch) | |
| tree | fc85417cd52a3967c970a57ab95352d33baae6e8 /drivers/mtd/core.c | |
| parent | e0ae56c00864b0c1dc77b34d26c4e59096ad5403 (diff) | |
| download | barebox-81737c1d436add87e26a22dca9dd750b9655de01.tar.gz barebox-81737c1d436add87e26a22dca9dd750b9655de01.tar.xz | |
mtd: Fix erasing of devices >4GiB
When a device >4GiB is erased, not only the offset can be bigger
than 4GiB, but also the size. This happens with the simplest command
to erase a device: erase /dev/nand0. Make the size argument a 64bit
type to make this work.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd/core.c')
| -rw-r--r-- | drivers/mtd/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c index 0bc9fed686..9234525e62 100644 --- a/drivers/mtd/core.c +++ b/drivers/mtd/core.c @@ -114,13 +114,13 @@ static struct mtd_erase_region_info *mtd_find_erase_region(struct mtd_info *mtd, return NULL; } -static int mtd_erase_align(struct mtd_info *mtd, size_t *count, loff_t *offset) +static int mtd_erase_align(struct mtd_info *mtd, loff_t *count, loff_t *offset) { struct mtd_erase_region_info *e; loff_t ofs; if (mtd->numeraseregions == 0) { - ofs = *offset & ~(mtd->erasesize - 1); + ofs = *offset & ~(loff_t)(mtd->erasesize - 1); *count += (*offset - ofs); *count = ALIGN(*count, mtd->erasesize); *offset = ofs; @@ -144,7 +144,7 @@ static int mtd_erase_align(struct mtd_info *mtd, size_t *count, loff_t *offset) return 0; } -static int mtd_op_erase(struct cdev *cdev, size_t count, loff_t offset) +static int mtd_op_erase(struct cdev *cdev, loff_t count, loff_t offset) { struct mtd_info *mtd = cdev->priv; struct erase_info erase; |