diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2014-10-29 18:56:26 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-10-29 18:56:26 -0700 |
| commit | 1f04a73e2c6368bac8f9e0ac3ada58e6b41163f0 (patch) | |
| tree | 4577b37dcef4700db2cb3b1f0902f49d56c83239 /drivers/mtd | |
| parent | 5935946c6a1180dcb495fffb2c45eddedfa09064 (diff) | |
| parent | 89cf38dd536a7301d6b5f5ddd73f42074c01bfaa (diff) | |
MTD: merge 3.18 development into -next development
To keep the two paths in sync
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0001.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/omap_elm.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index a7543ba3e190..3096f3ded3ad 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c @@ -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); diff --git a/drivers/mtd/nand/omap_elm.c b/drivers/mtd/nand/omap_elm.c index b4f61c7fc161..058531044ceb 100644 --- a/drivers/mtd/nand/omap_elm.c +++ b/drivers/mtd/nand/omap_elm.c @@ -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)) { |