2014-01-09 15:02:07

by Nicolas Ferre

Subject: [PATCH] ARM: at91: smc: bug fix in sam9_smc_cs_read()

From: Jean-Jacques Hiblot <[email protected]>

There was a copy/paste error when reading the nwe_pulse value.

Signed-off-by: Jean-Jacques Hiblot <[email protected]>
Acked-by: Boris BREZILLON <[email protected]>
Cc: stable <[email protected]> # 3.3
Signed-off-by: Nicolas Ferre <[email protected]>
---
Arnd, Olof, Kevin,

This is a little fix that I have just received. As the "fixes" colletion is
certainly closed for 3.13, I would like to include this one in the
"fixes-non-critical" topic for 3.14.

For the time being, I only have this one, so It can be convenient if you take
this fix as a patch instead of a pull-request.

Thanks, bye,
Nicolas Ferre

arch/arm/mach-at91/sam9_smc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c
index 99a0a1d2b7dc..b26156bf15db 100644
--- a/arch/arm/mach-at91/sam9_smc.c
+++ b/arch/arm/mach-at91/sam9_smc.c
@@ -101,7 +101,7 @@ static void sam9_smc_cs_read(void __iomem *base,
/* Pulse register */
val = __raw_readl(base + AT91_SMC_PULSE);

- config->nwe_setup = val & AT91_SMC_NWEPULSE;
+ config->nwe_pulse = val & AT91_SMC_NWEPULSE;
config->ncs_write_pulse = (val & AT91_SMC_NCS_WRPULSE) >> 8;
config->nrd_pulse = (val & AT91_SMC_NRDPULSE) >> 16;
config->ncs_read_pulse = (val & AT91_SMC_NCS_RDPULSE) >> 24;
--
1.8.2.2

2014-01-14 18:34:42

by Kevin Hilman

Subject: Re: [PATCH] ARM: at91: smc: bug fix in sam9_smc_cs_read()

Nicolas Ferre <[email protected]> writes:

> From: Jean-Jacques Hiblot <[email protected]>
>
> There was a copy/paste error when reading the nwe_pulse value.
>
> Signed-off-by: Jean-Jacques Hiblot <[email protected]>
> Acked-by: Boris BREZILLON <[email protected]>
> Cc: stable <[email protected]> # 3.3
> Signed-off-by: Nicolas Ferre <[email protected]>
> ---
> Arnd, Olof, Kevin,
>
> This is a little fix that I have just received. As the "fixes" colletion is
> certainly closed for 3.13, I would like to include this one in the
> "fixes-non-critical" topic for 3.14.
>
> For the time being, I only have this one, so It can be convenient if you take
> this fix as a patch instead of a pull-request.

Applied to fixes-non-critical, and merged into for-next.

Thanks,

Kevin