mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 17:51:43 +00:00
[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>
This commit is contained in:
parent
7b24919115
commit
4b5e33a7bf
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user