aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Miao <eric.miao@linaro.org>2011-09-06 23:20:25 -0700
committerEric Miao <eric.miao@linaro.org>2011-09-17 23:04:22 +0800
commitf83d0461771f606732631d5e200d25e1e30be74c (patch)
tree2bf86494c9c0d82bf41645e8dd711e534ebe6dc1
parentcaccadd117abcc2f956ed58625d6b47192993fe0 (diff)
downloadlinux-linaro-natty-f83d0461771f606732631d5e200d25e1e30be74c.tar.gz
SAUCE: mx53_loco: prevent gpio_keys_button data being released
BugLink: http://bugs.launchpad.net/bugs/746994 gpio_keys_button data will be used in the gpio_keys.c driver for later access, esp. in the gpio_keys_isr(). And this also caused resuming to be not working, prevent the data from being released by removing __initconst here. The true fix, however, will be gpio_keys.c not to assume the data will be always available and make a copy. Signed-off-by: Eric Miao <eric.miao@linaro.org>
-rw-r--r--arch/arm/mach-mx5/board-mx53_loco.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/board-mx53_loco.c b/arch/arm/mach-mx5/board-mx53_loco.c
index 200eb6f01a1f..fa128f6f1180 100644
--- a/arch/arm/mach-mx5/board-mx53_loco.c
+++ b/arch/arm/mach-mx5/board-mx53_loco.c
@@ -222,7 +222,7 @@ static iomux_v3_cfg_t mx53_loco_pads[] = {
.wakeup = wake, \
}
-static const struct gpio_keys_button loco_buttons[] __initconst = {
+static const struct gpio_keys_button loco_buttons[] = {
GPIO_BUTTON(MX53_LOCO_POWER, KEY_POWER, 1, "power", 1),
GPIO_BUTTON(MX53_LOCO_UI1, KEY_VOLUMEUP, 1, "volume-up", 0),
GPIO_BUTTON(MX53_LOCO_UI2, KEY_VOLUMEDOWN, 1, "volume-down", 0),