nand_base: fix for ONFI chips that do not support GET/SET FEATURES

[David Mosberger-Tang]

Sure.  C99-style comments replaced with old-style comments...

  --david


On Wed, May 1, 2013 at 8:28 PM, Huang Shijie <b32955 at freescale.com> wrote:
> 于 2013年05月01日 07:39, David Mosberger-Tang 写道:
>
>> The attached patch is relative to linux-mtd.  It fixes a problem with
>> NAND-chips that are ONFI-compliant but don't support the SET/GET
>> FEATURES commands (such as Spansion S34Mx).
>>
> good catch.
>
> but could you check your patch with scripts/checkpatch.pl , and then
> send out this patch?
>
> thanks
> Huang Shijie
>
>
-------------- next part --------------
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 at gmail.com>

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index dfcd0a5..13c8043 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2720,7 +2720,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 ||
+	    /* supports GET/SET FEATURES? */
+	    !(le16_to_cpu(chip->onfi_params.opt_cmd) & 4))
 		return -EINVAL;
 
 	chip->cmdfunc(mtd, NAND_CMD_SET_FEATURES, addr, -1);
@@ -2741,7 +2743,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 ||
+	    /* supports GET/SET FEATURES? */
+	    !(le16_to_cpu(chip->onfi_params.opt_cmd) & 4))
 		return -EINVAL;
 
 	/* clear the sub feature parameters */