Gitweb: http://git.kernel.org/linus/11e1ef2d105900a302b7ca92bcaf96a96d0274a1
Commit: 11e1ef2d105900a302b7ca92bcaf96a96d0274a1
Parent: 5241b6b3bfa7be3661398cf93cb3dd187aeb65c6
Author: stanley.miao <stanley.miao@windriver.com>
AuthorDate: Tue Apr 20 06:33:30 2010 +0000
Committer: Tony Lindgren <tony@atomide.com>
CommitDate: Fri Apr 23 15:35:11 2010 -0700
omap: fix a gpmc nand problem
If gpmc_t isn't given, we don't need to set timing for gpmc, or it will cause
a Oops.
Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/gpmc-nand.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
index 64d74f0..e57fb29 100644
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@ -39,6 +39,9 @@ static int omap2_nand_gpmc_retime(void)
struct gpmc_timings t;
int err;
+ if (!gpmc_nand_data->gpmc_t)
+ return 0;
+
memset(&t, 0, sizeof(t));
t.sync_clk = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->sync_clk);
t.cs_on = gpmc_round_ns_to_ticks(gpmc_nand_data->gpmc_t->cs_on);
--
