Patchwork [1/2] mtd: gpmi: Revert "mtd: gpmi: scan two nand chips"

login
register
mail settings
Submitter Fabio Estevam
Date Nov. 6, 2013, 5:16 p.m.
Message ID <1383758172-29798-1-git-send-email-festevam@gmail.com>
Download mbox | patch
Permalink /patch/288973/
State Rejected
Headers show

Comments

Fabio Estevam - Nov. 6, 2013, 5:16 p.m.
From: Fabio Estevam <fabio.estevam@freescale.com>

This revert is needed so that the revert of commit f720e7ce5 
("mtd: gpmi: remove the nand_scan()") can be succesfully applied.

This reverts commit cdef39de399fc6806f85c60ef97c9e394b3a92d4.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Huang Shijie - Nov. 7, 2013, 2:45 a.m.
于 2013年11月07日 01:16, Fabio Estevam 写道:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> This revert is needed so that the revert of commit f720e7ce5 
> ("mtd: gpmi: remove the nand_scan()") can be succesfully applied.
>
> This reverts commit cdef39de399fc6806f85c60ef97c9e394b3a92d4.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index 7ac2280..a5c60c4 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -1674,7 +1674,7 @@ static int gpmi_nfc_init(struct gpmi_nand_data *this)
>  	if (ret)
>  		goto err_out;
>  
> -	ret = nand_scan_ident(mtd, 2, NULL);
> +	ret = nand_scan_ident(mtd, 1, NULL);
>  	if (ret)
>  		goto err_out;
>  
Please do not revert the patches.

It's not the right way to fix this.
I will spend some time to this bug today.

thanks

Huang Shijie

Patch

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 7ac2280..a5c60c4 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -1674,7 +1674,7 @@  static int gpmi_nfc_init(struct gpmi_nand_data *this)
 	if (ret)
 		goto err_out;
 
-	ret = nand_scan_ident(mtd, 2, NULL);
+	ret = nand_scan_ident(mtd, 1, NULL);
 	if (ret)
 		goto err_out;