diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-05-01 22:36:44 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-05-01 22:36:44 +0200 |
| commit | 57e363b8c45b6626b012f6ce39a2f70adf6b49fc (patch) | |
| tree | 720d15f5f181787aa815a17f1a4a7b82dc836019 /drivers/mtd/nand/nandsim.c | |
| parent | mtd: physmap_of: use OF helpers for reading strings (diff) | |
| parent | mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program (diff) | |
| download | linux-57e363b8c45b6626b012f6ce39a2f70adf6b49fc.tar.xz linux-57e363b8c45b6626b012f6ce39a2f70adf6b49fc.zip | |
Merge tag 'nand/for-4.12' of github.com:linux-nand/linux into MTD
From Boris:
"""
This pull request contains:
- some minor fixes/improvements on existing drivers (fsmc, gpio, ifc,
davinci, brcmnand, omap)
- a huge cleanup/rework of the denali driver accompanied with core
fixes/improvements to simplify the driver code
- a complete rewrite of the atmel driver to support new DT bindings
make future evolution easier
- the addition of per-vendor detection/initialization steps to avoid
extending the nand_ids table with more extended-id entries
"""
Diffstat (limited to 'drivers/mtd/nand/nandsim.c')
| -rw-r--r-- | drivers/mtd/nand/nandsim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index c84742671a5f..cef818f535ed 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c @@ -901,7 +901,7 @@ static int parse_weakpages(void) zero_ok = (*w == '0' ? 1 : 0); page_no = simple_strtoul(w, &w, 0); if (!zero_ok && !page_no) { - NS_ERR("invalid weakpagess.\n"); + NS_ERR("invalid weakpages.\n"); return -EINVAL; } max_writes = 3; |