[PATCH] [MTD] physmap: resume already suspended chips on failure to suspend

[Kleine-Koenig, Uwe]

A nice side effect of this patch is that the return value of
physmap_flash_suspend in the error path is the value of the first failing
suspend callback and not the bitwise OR of all of them.

Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
---
 drivers/mtd/maps/physmap.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index f04061f..814b617 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -203,8 +203,22 @@ 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;
--
1.5.6.2