diff options
author | Robert Jarzmik <rjarzmik@free.fr> | 2008-07-22 03:39:00 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 09:53:03 -0400 |
commit | 7b2491911540e4904498622fbee2e1a9e3120d2f (patch) | |
tree | 30d3b76c3073e37a7034a71cc18ec8ff5ad73ba2 | |
parent | 998453fbf2e0709bf65ac419718ad284401b2b4f (diff) |
[MTD] physmap: Fix suspend/resume/shutdown bugs.
Don't call suspend/resume functions if they have not been
defined.
Signed-off-by: Robert Jarzmik <rjarzmik@free.fr>
Acked-By: Jörn Engel <joern@logfs.org>
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.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 1f6b9066b63e..7c8cdf49deb6 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c | |||
@@ -201,7 +201,8 @@ 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 | ret |= info->mtd[i]->suspend(info->mtd[i]); | 204 | if (info->mtd[i]->suspend) |
205 | ret |= info->mtd[i]->suspend(info->mtd[i]); | ||
205 | 206 | ||
206 | return ret; | 207 | return ret; |
207 | } | 208 | } |
@@ -212,7 +213,8 @@ static int physmap_flash_resume(struct platform_device *dev) | |||
212 | int i; | 213 | int i; |
213 | 214 | ||
214 | for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) | 215 | for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) |
215 | info->mtd[i]->resume(info->mtd[i]); | 216 | if (info->mtd[i]->resume) |
217 | info->mtd[i]->resume(info->mtd[i]); | ||
216 | 218 | ||
217 | return 0; | 219 | return 0; |
218 | } | 220 | } |
@@ -223,8 +225,9 @@ static void physmap_flash_shutdown(struct platform_device *dev) | |||
223 | int i; | 225 | int i; |
224 | 226 | ||
225 | for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) | 227 | for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++) |
226 | if (info->mtd[i]->suspend(info->mtd[i]) == 0) | 228 | if (info->mtd[i]->suspend && info->mtd[i]->resume) |
227 | info->mtd[i]->resume(info->mtd[i]); | 229 | if (info->mtd[i]->suspend(info->mtd[i]) == 0) |
230 | info->mtd[i]->resume(info->mtd[i]); | ||
228 | } | 231 | } |
229 | #else | 232 | #else |
230 | #define physmap_flash_suspend NULL | 233 | #define physmap_flash_suspend NULL |