mtd: nand_base: Only use GET/SET FEATURES command on chips that support them.

Spansion's S34MLx chips support ONFI but not the GET/SET FEATURES calls.

Signed-off-by: David Mosberger <dmosberger@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index edc7663f4b7b..1cbacffb5106 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2709,7 +2709,9 @@ static int nand_onfi_set_features(struct mtd_info *mtd, struct nand_chip *chip,
 {
         int status;
 
-        if (!chip->onfi_version)
+        if (!chip->onfi_version ||
+            !(le16_to_cpu(chip->onfi_params.opt_cmd)
+              & ONFI_OPT_CMD_SET_GET_FEATURES))
                 return -EINVAL;
 
         chip->cmdfunc(mtd, NAND_CMD_SET_FEATURES, addr, -1);
@@ -2730,7 +2732,9 @@ static int nand_onfi_set_features(struct mtd_info *mtd, struct nand_chip *chip,
 static int nand_onfi_get_features(struct mtd_info *mtd, struct nand_chip *chip,
                         int addr, uint8_t *subfeature_param)
 {
-        if (!chip->onfi_version)
+        if (!chip->onfi_version ||
+            !(le16_to_cpu(chip->onfi_params.opt_cmd)
+              & ONFI_OPT_CMD_SET_GET_FEATURES))
                 return -EINVAL;
 
         /* clear the sub feature parameters */