Merge branch 'clock_devel_3.7' into hwmod_prcm_clock_a_3.7

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / gpmc.c

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 5de0f7b852f765e16219c76f2b52917b573c3cc7..fe75656f990097e32a571964e2825c612c3e2adb 100644 (file)
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -297,7 +297,7 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t)
 
        div = gpmc_cs_calc_divider(cs, t->sync_clk);
        if (div < 0)
-               return -1;
+               return div;
 
        GPMC_SET_ONE(GPMC_CS_CONFIG2,  0,  3, cs_on);
        GPMC_SET_ONE(GPMC_CS_CONFIG2,  8, 12, cs_rd_off);