aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2010-10-16 07:55:52 -0400
committerBen Dooks <ben-linux@fluff.org>2010-10-29 19:21:37 -0400
commitbdf5005b738c1542a30b41a83069329313fc61f6 (patch)
treec6d0245a2d9e0dec4028a059e6281e8fbc75c807
parente33ffd4d28a2d516e32126ebabf4d9e930254cf5 (diff)
ARM: S3C2440: fix boot failure introduced by recent changes in gpiolib
Recent changes in s3c gpio break mini2440 board and may be others. The problem is that mach-mini2440.c: mini2440_init() (where we call s3c_gpio_setpull()) is called before s3c2440.c: s3c2440_init() (where we initialize s3c24xx_gpiocfg_default.set_pull function pointer). This causes dereferencing of NULL pointer at boot time and a kernel panic. Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/plat-s3c24xx/gpiolib.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c
index 4c0896f2572d..ae9d3c2403f0 100644
--- a/arch/arm/plat-s3c24xx/gpiolib.c
+++ b/arch/arm/plat-s3c24xx/gpiolib.c
@@ -87,6 +87,8 @@ static struct s3c_gpio_cfg s3c24xx_gpiocfg_banka = {
87struct s3c_gpio_cfg s3c24xx_gpiocfg_default = { 87struct s3c_gpio_cfg s3c24xx_gpiocfg_default = {
88 .set_config = s3c_gpio_setcfg_s3c24xx, 88 .set_config = s3c_gpio_setcfg_s3c24xx,
89 .get_config = s3c_gpio_getcfg_s3c24xx, 89 .get_config = s3c_gpio_getcfg_s3c24xx,
90 .set_pull = s3c_gpio_setpull_1up,
91 .get_pull = s3c_gpio_getpull_1up,
90}; 92};
91 93
92struct s3c_gpio_chip s3c24xx_gpios[] = { 94struct s3c_gpio_chip s3c24xx_gpios[] = {