From: Aaro Koskinen <aaro.koskinen@nokia.com>
Date: Fri, 17 Dec 2010 23:13:46 +0000 (-0800)
Subject: arm: omap: sdram-nokia: improve error handling
X-Git-Tag: MMI-PSA29.97-13-9~21439^2~44^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2b1af87ace4776f0d0c3513923a79529fc1b5a00;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

arm: omap: sdram-nokia: improve error handling

Actually check for errors: print an error log and return NULL.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/sdram-nokia.c b/arch/arm/mach-omap2/sdram-nokia.c
index 1171451ef7f2..863586bdb98a 100644
--- a/arch/arm/mach-omap2/sdram-nokia.c
+++ b/arch/arm/mach-omap2/sdram-nokia.c
@@ -223,10 +223,14 @@ struct omap_sdrc_params *nokia_get_sdram_timings(void)
 	int err = 0;
 	int i;
 
-	for (i = 0; i < ARRAY_SIZE(nokia_timings); i++)
+	for (i = 0; i < ARRAY_SIZE(nokia_timings); i++) {
 		err |= sdrc_timings(i, nokia_timings[i].rate,
 				       nokia_timings[i].data);
+		if (err)
+			pr_err("%s: error with rate %ld: %d\n", __func__,
+			       nokia_timings[i].rate, err);
+	}
 
-	return &nokia_sdrc_params[0];
+	return err ? NULL : nokia_sdrc_params;
 }