Commit 7b249191 authored by Robert Jarzmik's avatar Robert Jarzmik Committed by David Woodhouse

[MTD] physmap: Fix suspend/resume/shutdown bugs.

Don't call suspend/resume functions if they have not been
defined.
Signed-off-by: default avatarRobert Jarzmik <rjarzmik@free.fr>
Acked-By: default avatarJörn Engel <joern@logfs.org>
Signed-off-by: default avatarUwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 998453fb
...@@ -201,7 +201,8 @@ static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state ...@@ -201,7 +201,8 @@ static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state
int i; int i;
for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
ret |= info->mtd[i]->suspend(info->mtd[i]); if (info->mtd[i]->suspend)
ret |= info->mtd[i]->suspend(info->mtd[i]);
return ret; return ret;
} }
...@@ -212,7 +213,8 @@ static int physmap_flash_resume(struct platform_device *dev) ...@@ -212,7 +213,8 @@ static int physmap_flash_resume(struct platform_device *dev)
int i; int i;
for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
info->mtd[i]->resume(info->mtd[i]); if (info->mtd[i]->resume)
info->mtd[i]->resume(info->mtd[i]);
return 0; return 0;
} }
...@@ -223,8 +225,9 @@ static void physmap_flash_shutdown(struct platform_device *dev) ...@@ -223,8 +225,9 @@ static void physmap_flash_shutdown(struct platform_device *dev)
int i; int i;
for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
if (info->mtd[i]->suspend(info->mtd[i]) == 0) if (info->mtd[i]->suspend && info->mtd[i]->resume)
info->mtd[i]->resume(info->mtd[i]); if (info->mtd[i]->suspend(info->mtd[i]) == 0)
info->mtd[i]->resume(info->mtd[i]);
} }
#else #else
#define physmap_flash_suspend NULL #define physmap_flash_suspend NULL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment