diff mbox series

mtd: nand: gpio: Fix ALE gpio configuration

Message ID 20171206172714.ABE156C6B0@po15668-vm-win7.idsi0.si.c-s.fr
State Accepted
Delegated to: Richard Weinberger
Headers show
Series mtd: nand: gpio: Fix ALE gpio configuration | expand

Commit Message

Christophe Leroy Dec. 6, 2017, 5:27 p.m. UTC
Fixes a copy/paste error in commit f3d0d8d938b4d ("mtd: nand: gpio:
Convert to use GPIO descriptors") which breaks gpio-nand driver

Fixes: f3d0d8d938b4d ("mtd: nand: gpio: Convert to use GPIO descriptors")
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
 drivers/mtd/nand/gpio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Richard Weinberger Dec. 6, 2017, 10:28 p.m. UTC | #1
Am Mittwoch, 6. Dezember 2017, 18:27:14 CET schrieb Christophe Leroy:
> Fixes a copy/paste error in commit f3d0d8d938b4d ("mtd: nand: gpio:
> Convert to use GPIO descriptors") which breaks gpio-nand driver
> 
> Fixes: f3d0d8d938b4d ("mtd: nand: gpio: Convert to use GPIO descriptors")
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
>  drivers/mtd/nand/gpio.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
> index 484f7fbc3f7d..a8bde6665c24 100644
> --- a/drivers/mtd/nand/gpio.c
> +++ b/drivers/mtd/nand/gpio.c
> @@ -253,9 +253,9 @@ static int gpio_nand_probe(struct platform_device *pdev)
> goto out_ce;
>  	}
> 
> -	gpiomtd->nwp = devm_gpiod_get(dev, "ale", GPIOD_OUT_LOW);
> -	if (IS_ERR(gpiomtd->nwp)) {
> -		ret = PTR_ERR(gpiomtd->nwp);
> +	gpiomtd->ale = devm_gpiod_get(dev, "ale", GPIOD_OUT_LOW);
> +	if (IS_ERR(gpiomtd->ale)) {
> +		ret = PTR_ERR(gpiomtd->ale);
>  		goto out_ce;
>  	}

Reviewed-by: Richard Weinberger <richard@nod.at>

Thanks,
//richard
Boris Brezillon Dec. 6, 2017, 10:39 p.m. UTC | #2
On Wed, 06 Dec 2017 23:28:11 +0100
Richard Weinberger <richard@nod.at> wrote:

> Am Mittwoch, 6. Dezember 2017, 18:27:14 CET schrieb Christophe Leroy:
> > Fixes a copy/paste error in commit f3d0d8d938b4d ("mtd: nand: gpio:
> > Convert to use GPIO descriptors") which breaks gpio-nand driver
> > 
> > Fixes: f3d0d8d938b4d ("mtd: nand: gpio: Convert to use GPIO descriptors")
> > Cc: Linus Walleij <linus.walleij@linaro.org>

Cc: <stable@vger.kernel.org>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>

Richard, can you queue that one to the fixes branch?

> > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> > ---
> >  drivers/mtd/nand/gpio.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
> > index 484f7fbc3f7d..a8bde6665c24 100644
> > --- a/drivers/mtd/nand/gpio.c
> > +++ b/drivers/mtd/nand/gpio.c
> > @@ -253,9 +253,9 @@ static int gpio_nand_probe(struct platform_device *pdev)
> > goto out_ce;
> >  	}
> > 
> > -	gpiomtd->nwp = devm_gpiod_get(dev, "ale", GPIOD_OUT_LOW);
> > -	if (IS_ERR(gpiomtd->nwp)) {
> > -		ret = PTR_ERR(gpiomtd->nwp);
> > +	gpiomtd->ale = devm_gpiod_get(dev, "ale", GPIOD_OUT_LOW);
> > +	if (IS_ERR(gpiomtd->ale)) {
> > +		ret = PTR_ERR(gpiomtd->ale);
> >  		goto out_ce;
> >  	}  
> 
> Reviewed-by: Richard Weinberger <richard@nod.at>
> 
> Thanks,
> //richard
Boris Brezillon Dec. 6, 2017, 10:45 p.m. UTC | #3
On Wed, 6 Dec 2017 23:39:27 +0100
Boris Brezillon <boris.brezillon@free-electrons.com> wrote:

> On Wed, 06 Dec 2017 23:28:11 +0100
> Richard Weinberger <richard@nod.at> wrote:
> 
> > Am Mittwoch, 6. Dezember 2017, 18:27:14 CET schrieb Christophe Leroy:  
> > > Fixes a copy/paste error in commit f3d0d8d938b4d ("mtd: nand: gpio:
> > > Convert to use GPIO descriptors") which breaks gpio-nand driver
> > > 
> > > Fixes: f3d0d8d938b4d ("mtd: nand: gpio: Convert to use GPIO descriptors")
> > > Cc: Linus Walleij <linus.walleij@linaro.org>  
> 
> Cc: <stable@vger.kernel.org>

Oops, forget the Cc-stable tag, f3d0d8d938b4d has been merged in
4.15-rc1.

> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> 
> Richard, can you queue that one to the fixes branch?
> 
> > > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> > > ---
> > >  drivers/mtd/nand/gpio.c | 6 +++---
> > >  1 file changed, 3 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
> > > index 484f7fbc3f7d..a8bde6665c24 100644
> > > --- a/drivers/mtd/nand/gpio.c
> > > +++ b/drivers/mtd/nand/gpio.c
> > > @@ -253,9 +253,9 @@ static int gpio_nand_probe(struct platform_device *pdev)
> > > goto out_ce;
> > >  	}
> > > 
> > > -	gpiomtd->nwp = devm_gpiod_get(dev, "ale", GPIOD_OUT_LOW);
> > > -	if (IS_ERR(gpiomtd->nwp)) {
> > > -		ret = PTR_ERR(gpiomtd->nwp);
> > > +	gpiomtd->ale = devm_gpiod_get(dev, "ale", GPIOD_OUT_LOW);
> > > +	if (IS_ERR(gpiomtd->ale)) {
> > > +		ret = PTR_ERR(gpiomtd->ale);
> > >  		goto out_ce;
> > >  	}    
> > 
> > Reviewed-by: Richard Weinberger <richard@nod.at>
> > 
> > Thanks,
> > //richard  
>
Linus Walleij Dec. 10, 2017, 12:26 a.m. UTC | #4
On Wed, Dec 6, 2017 at 6:27 PM, Christophe Leroy
<christophe.leroy@c-s.fr> wrote:

> Fixes a copy/paste error in commit f3d0d8d938b4d ("mtd: nand: gpio:
> Convert to use GPIO descriptors") which breaks gpio-nand driver
>
> Fixes: f3d0d8d938b4d ("mtd: nand: gpio: Convert to use GPIO descriptors")
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>

Sorry about that :(
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij
diff mbox series

Patch

diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
index 484f7fbc3f7d..a8bde6665c24 100644
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/gpio.c
@@ -253,9 +253,9 @@  static int gpio_nand_probe(struct platform_device *pdev)
 		goto out_ce;
 	}
 
-	gpiomtd->nwp = devm_gpiod_get(dev, "ale", GPIOD_OUT_LOW);
-	if (IS_ERR(gpiomtd->nwp)) {
-		ret = PTR_ERR(gpiomtd->nwp);
+	gpiomtd->ale = devm_gpiod_get(dev, "ale", GPIOD_OUT_LOW);
+	if (IS_ERR(gpiomtd->ale)) {
+		ret = PTR_ERR(gpiomtd->ale);
 		goto out_ce;
 	}