aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <Uwe.Kleine-Koenig@digi.com>2008-07-22 03:39:01 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-07-25 09:53:26 -0400
commit4b5e33a7bf185c8d8568a807d9805fb155bcedd9 (patch)
tree6e8658fe6708ea36260f8e813cbdc88500c4ca10
parent7b2491911540e4904498622fbee2e1a9e3120d2f (diff)
[MTD] physmap: resume already suspended chips on failure to suspend
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@digi.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/maps/physmap.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 7c8cdf49deb6..42d844f8f6bf 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
201 int i; 201 int i;
202 202
203 for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) 203 for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
204 if (info->mtd[i]->suspend) 204 if (info->mtd[i]->suspend) {
205 ret |= info->mtd[i]->suspend(info->mtd[i]); 205 ret = info->mtd[i]->suspend(info->mtd[i]);
206 if (ret)
207 goto fail;
208 }
209
210 return 0;
211fail:
212 for (--i; i >= 0; --i)
213 if (info->mtd[i]->suspend) {
214 BUG_ON(!info->mtd[i]->resume);
215 info->mtd[i]->resume(info->mtd[i]);
216 }
206 217
207 return ret; 218 return ret;
208} 219}