Messages in this thread Patch in this message | | | From | Andi Kleen <> | Subject | [PATCH] [41/50] ARM: pxa: fix PGSR register address calculation | Date | Thu, 28 Jul 2011 16:44:46 -0700 (PDT) |
| |
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Paul Parsons <lost.distance@yahoo.com>
[ upstream commit beb0c9b056b1c23d2029b46a425362e9ccbeba01 ]
The file mfp-pxa2xx.c defines a macro, PGSR(), which translates a gpio bank number to a PGSR register address. The function pxa2xx_mfp_suspend() erroneously passed in a gpio number instead of a gpio bank number.
Signed-off-by: Paul Parsons <lost.distance@yahoo.com> Cc: stable@kernel.org Signed-off-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Andi Kleen <ak@linux.intel.com>
Index: linux-2.6.35.y/arch/arm/mach-pxa/mfp-pxa2xx.c =================================================================== --- linux-2.6.35.y.orig/arch/arm/mach-pxa/mfp-pxa2xx.c +++ linux-2.6.35.y/arch/arm/mach-pxa/mfp-pxa2xx.c @@ -347,9 +347,9 @@ static int pxa2xx_mfp_suspend(struct sys if ((gpio_desc[i].config & MFP_LPM_KEEP_OUTPUT) && (GPDR(i) & GPIO_bit(i))) { if (GPLR(i) & GPIO_bit(i)) - PGSR(i) |= GPIO_bit(i); + PGSR(gpio_to_bank(i)) |= GPIO_bit(i); else - PGSR(i) &= ~GPIO_bit(i); + PGSR(gpio_to_bank(i)) &= ~GPIO_bit(i); } }
| |