Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d489ff42 authored by Brian Norris's avatar Brian Norris
Browse files

Revert "mtd: mtdram: check offs and len in mtdram->erase" 



This reverts commit 7827e3ac.

There are some 64-bit arithmetic issues on some architectures, so let's
wait until we get a better patch for this.

Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 7827e3ac

drivers/mtd/devices/mtdram.c

+0 −21
Original line number Diff line number Diff line
@@ -32,29 +32,8 @@ MODULE_PARM_DESC(erase_size, "Device erase block size in KiB"); 
// We could store these in the mtd structure, but we only support 1 device..

static struct mtd_info *mtd_info;



static int check_offs_len(struct mtd_info *mtd, loff_t ofs, uint64_t len)

{

	int ret = 0;



	/* Start address must align on block boundary */

	if (ofs % mtd->erasesize) {

		pr_debug("%s: unaligned address\n", __func__);

		ret = -EINVAL;

	}



	/* Length must align on block boundary */

	if (len % mtd->erasesize) {

		pr_debug("%s: length not block aligned\n", __func__);

		ret = -EINVAL;

	}



	return ret;

}



static int ram_erase(struct mtd_info *mtd, struct erase_info *instr)

{

	if (check_offs_len(mtd, instr->addr, instr->len))

		return -EINVAL;

	memset((char *)mtd->priv + instr->addr, 0xff, instr->len);

	instr->state = MTD_ERASE_DONE;

	mtd_erase_callback(instr);