diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-01-08 10:29:08 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-01-08 10:29:08 -0800 |
| commit | d04eb60066ed532d2e5da9f39cc0c79883d8a33c (patch) | |
| tree | 7c395d937dd1a430ce4a9001698d97d5f1731ba8 /arch | |
| parent | 1b6e821f234f9e22ad1ef4919e140625af251935 (diff) | |
| download | op-kernel-dev-d04eb60066ed532d2e5da9f39cc0c79883d8a33c.zip op-kernel-dev-d04eb60066ed532d2e5da9f39cc0c79883d8a33c.tar.gz | |
omap3: Fix booting if package is uninitialized
Otherwise bringing up new boards can be harder:
Unable to handle kernel NULL pointer dereference at virtual address 00000000
pgd = c0004000
[00000000] *pgd=00000000
Internal error: Oops: 5 [#1]
last sysfs file:
Modules linked in:
CPU: 0 Not tainted (2.6.33-rc2-00015-g0bc9c93-dirty #37)
PC is at omap_mux_init+0xa4/0x3d8
LR is at omap_mux_init+0x3c/0x3d8
...
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/mux.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index e071b3f..459ef23a 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -994,8 +994,10 @@ int __init omap_mux_init(u32 mux_pbase, u32 mux_size, } #ifdef CONFIG_OMAP_MUX - omap_mux_package_fixup(package_subset, superset); - omap_mux_package_init_balls(package_balls, superset); + if (package_subset) + omap_mux_package_fixup(package_subset, superset); + if (package_balls) + omap_mux_package_init_balls(package_balls, superset); omap_mux_set_cmdline_signals(); omap_mux_set_board_signals(board_mux); #endif |
