1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 2ca507f3a58c..d8f2cacea750 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -1028,8 +1028,8 @@ EXPORT_SYMBOL(gpmc_cs_request);
 
 void gpmc_cs_free(int cs)
 {
-        struct gpmc_cs_data *gpmc = &gpmc_cs[cs];
-        struct resource *res = &gpmc->mem;
+        struct gpmc_cs_data *gpmc;
+        struct resource *res;
 
         spin_lock(&gpmc_mem_lock);
         if (cs >= gpmc_cs_num || cs < 0 || !gpmc_cs_reserved(cs)) {
@@ -1038,6 +1038,9 @@ void gpmc_cs_free(int cs)
                 spin_unlock(&gpmc_mem_lock);
                 return;
         }
+        gpmc = &gpmc_cs[cs];
+        res = &gpmc->mem;
+
         gpmc_cs_disable_mem(cs);
         if (res->flags)
                 release_resource(res);