1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 7c8cdf49deb..42d844f8f6b 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -201,8 +201,19 @@ static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state
         int i;
 
         for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
-                if (info->mtd[i]->suspend)
-                        ret |= info->mtd[i]->suspend(info->mtd[i]);
+                if (info->mtd[i]->suspend) {
+                        ret = info->mtd[i]->suspend(info->mtd[i]);
+                        if (ret)
+                                goto fail;
+                }
+
+        return 0;
+fail:
+        for (--i; i >= 0; --i)
+                if (info->mtd[i]->suspend) {
+                        BUG_ON(!info->mtd[i]->resume);
+                        info->mtd[i]->resume(info->mtd[i]);
+                }
 
         return ret;
 }