From db9ef8e48aed0fe459a51d1c3b39a3f27fdb52ce Mon Sep 17 00:00:00 2001 From: "stanley.miao" Date: Tue, 20 Apr 2010 06:33:30 +0000 Subject: [PATCH] --- yaml --- r: 190293 b: refs/heads/master c: 11e1ef2d105900a302b7ca92bcaf96a96d0274a1 h: refs/heads/master i: 190291: 16d0f7f557d2f7a101e2e0c91f5923e9ac32bcbc v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/gpmc-nand.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 678cc7f9d86c..e82211347845 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5241b6b3bfa7be3661398cf93cb3dd187aeb65c6 +refs/heads/master: 11e1ef2d105900a302b7ca92bcaf96a96d0274a1 diff --git a/trunk/arch/arm/mach-omap2/gpmc-nand.c b/trunk/arch/arm/mach-omap2/gpmc-nand.c index 64d74f05abbe..e57fb29ff855 100644 --- a/trunk/arch/arm/mach-omap2/gpmc-nand.c +++ b/trunk/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);