summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu-Huan Hsu <yhsu@nvidia.com>2010-06-24 20:45:32 -0700
committerGary King <gking@nvidia.com>2010-06-24 22:07:09 -0700
commitc9bdce94608a9c2efec13d18e85057455ad2befb (patch)
tree0d339bdfc01a980a14e98d7932b5b2b7447b9851
parent4fa900d738b670f93bbf72210851887391a1b99b (diff)
[ARM/tegra] Fix data abort in tegra_setup_spi
Added check on number of entries on sflash_mux to avoid data abort caused by accessing non-existing sflash_mux array. Change-Id: I252ff0eb70b382dcc6e63f087b9dc3f21083eade Reviewed-on: http://git-master/r/3173 Tested-by: Yu-Huan Hsu <yhsu@nvidia.com> Reviewed-by: Gary King <gking@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-nvodm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-nvodm.c b/arch/arm/mach-tegra/board-nvodm.c
index 44a9863d8f37..451506e6a763 100644
--- a/arch/arm/mach-tegra/board-nvodm.c
+++ b/arch/arm/mach-tegra/board-nvodm.c
@@ -1064,7 +1064,7 @@ static noinline void __init tegra_setup_spi(void)
if (plat->is_slink && pdev->id<spi_mux_nr)
mux = spi_mux[pdev->id];
- else if (!plat->is_slink)
+ else if (sflash_mux_nr && !plat->is_slink)
mux = sflash_mux[0];
if (!mux)