The callers of gpmc_cs_set_timings() expect to receive -ERRNO on errors
and they pass further what they have received.

However gpmc_cs_set_timings() was returning -1 (equal to -EPERM) which
does not make sense in this context.

Signed-off-by: Krzysztof Kozlowski <k...@kernel.org>

---

Not tested

Changes since v1:
1. New patch
---
 drivers/memory/omap-gpmc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index c158b6cae9a9..1e370142dfca 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -638,7 +638,7 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, 
int end_bit, int max
 #define GPMC_SET_ONE_CD_MAX(reg, st, end, max, field, cd)  \
        if (set_gpmc_timing_reg(cs, (reg), (st), (end), (max), \
            t->field, (cd), #field) < 0)                       \
-               return -1
+               return -ENXIO
 
 #define GPMC_SET_ONE(reg, st, end, field) \
        GPMC_SET_ONE_CD_MAX(reg, st, end, 0, field, GPMC_CD_FCLK)
@@ -708,7 +708,7 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings 
*t,
 
        div = gpmc_calc_divider(t->sync_clk);
        if (div < 0)
-               return div;
+               return -EINVAL;
 
        /*
         * See if we need to change the divider for waitmonitoringtime.
@@ -733,7 +733,7 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings 
*t,
                               __func__,
                               t->wait_monitoring
                               );
-                       return -1;
+                       return -ENXIO;
                }
        }
 
-- 
2.17.1

Reply via email to