diff options
| -rw-r--r-- | Documentation/devicetree/index.rst | 1 | ||||
| -rw-r--r-- | common/bbu.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/devicetree/index.rst b/Documentation/devicetree/index.rst index 8c47d033fc..ce62ebe109 100644 --- a/Documentation/devicetree/index.rst +++ b/Documentation/devicetree/index.rst @@ -108,6 +108,7 @@ Contents: :maxdepth: 1 bindings/barebox/* + bindings/firmware/* bindings/leds/* bindings/misc/* bindings/mtd/* diff --git a/common/bbu.c b/common/bbu.c index 1279d56155..ee9f78ecc9 100644 --- a/common/bbu.c +++ b/common/bbu.c @@ -313,7 +313,7 @@ static int bbu_std_file_handler(struct bbu_handler *handler, return fd; ret = protect(fd, data->len, 0, 0); - if (ret && ret != -ENOSYS) { + if (ret && (ret != -ENOSYS) && (ret != -ENOTSUPP)) { printf("unprotecting %s failed with %s\n", data->devicefile, strerror(-ret)); goto err_close; diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index db13f5b7e4..58d53b7a78 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -1351,8 +1351,7 @@ static int __init atmel_nand_probe(struct device_d *dev) nand_chip->ecc.strength = pdata->ecc_strength ? : 1; nand_chip->ecc.size = 1 << pdata->ecc_size_shift ? : 512; - if (IS_ENABLED(CONFIG_NAND_ECC_HW) && - pdata->ecc_mode == NAND_ECC_HW) { + if (pdata->ecc_mode == NAND_ECC_HW) { nand_chip->ecc.mode = NAND_ECC_HW; } @@ -1411,8 +1410,7 @@ static int __init atmel_nand_probe(struct device_d *dev) host->ecc_code = xmalloc(mtd->oobsize); - if (IS_ENABLED(CONFIG_NAND_ECC_HW) && - nand_chip->ecc.mode == NAND_ECC_HW) { + if (nand_chip->ecc.mode == NAND_ECC_HW) { if (IS_ENABLED(CONFIG_NAND_ATMEL_PMECC) && pdata->has_pmecc) res = atmel_pmecc_nand_init_params(dev, host); else |