Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c
index 04fdfcca93f7..65655dd59e1f 100644
--- a/drivers/mtd/lpddr/lpddr_cmds.c
+++ b/drivers/mtd/lpddr/lpddr_cmds.c
@@ -3,7 +3,7 @@
  * erase, lock/unlock support for LPDDR flash memories
  * (C) 2008 Korolev Alexey <akorolev@infradead.org>
  * (C) 2008 Vasiliy Leonenko <vasiliy.leonenko@gmail.com>
- * Many thanks to Roman Borisov for intial enabling
+ * Many thanks to Roman Borisov for initial enabling
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -171,7 +171,7 @@ static int wait_for_ready(struct map_info *map, struct flchip *chip,
                         mutex_lock(&chip->mutex);
                 }
                 if (chip->erase_suspended || chip->write_suspended)  {
-                        /* Suspend has occured while sleep: reset timeout */
+                        /* Suspend has occurred while sleep: reset timeout */
                         timeo = reset_timeo;
                         chip->erase_suspended = chip->write_suspended = 0;
                 }
@@ -313,12 +313,7 @@ static int chip_ready(struct map_info *map, struct flchip *chip, int mode)
                 if (ret) {
                         /* Oops. something got wrong. */
                         /* Resume and pretend we weren't here.  */
-                        map_write(map, CMD(LPDDR_RESUME),
-                                map->pfow_base + PFOW_COMMAND_CODE);
-                        map_write(map, CMD(LPDDR_START_EXECUTION),
-                                map->pfow_base + PFOW_COMMAND_EXECUTE);
-                        chip->state = FL_ERASING;
-                        chip->oldstate = FL_READY;
+                        put_chip(map, chip);
                         printk(KERN_ERR "%s: suspend operation failed."
                                         "State may be wrong \n", map->name);
                         return -EIO;
@@ -383,7 +378,6 @@ static void put_chip(struct map_info *map, struct flchip *chip)
 
         switch (chip->oldstate) {
         case FL_ERASING:
-                chip->state = chip->oldstate;
                 map_write(map, CMD(LPDDR_RESUME),
                                 map->pfow_base + PFOW_COMMAND_CODE);
                 map_write(map, CMD(LPDDR_START_EXECUTION),