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

Commit 1f04a73e authored by Brian Norris's avatar Brian Norris
Browse files

MTD: merge 3.18 development into -next development 

To keep the two paths in sync
parents 5935946c 89cf38dd

drivers/mtd/chips/cfi_cmdset_0001.c

+2 −0
Original line number Diff line number Diff line
@@ -2590,6 +2590,8 @@ static void cfi_intelext_resume(struct mtd_info *mtd) 


		/* Go to known state. Chip may have been power cycled */

		if (chip->state == FL_PM_SUSPENDED) {

			/* Refresh LH28F640BF Partition Config. Register */

			fixup_LH28F640BF(mtd);

			map_write(map, CMD(0xFF), cfi->chips[i].start);

			chip->oldstate = chip->state = FL_READY;

			wake_up(&chip->wq);

drivers/mtd/nand/omap_elm.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ int elm_config(struct device *dev, enum bch_ecc bch_type, 


	if (!info) {

		dev_err(dev, "Unable to configure elm - device not probed?\n");

		return -ENODEV;

		return -EPROBE_DEFER;

	}

	/* ELM cannot detect ECC errors for chunks > 1KB */

	if (ecc_step_size > ((ELM_ECC_SIZE + 1) / 2)) {