From f041cfb4fe39dfedacfc37a858038432826c7696 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 29 Oct 2005 16:14:08 +0100 Subject: [PATCH] --- yaml --- r: 11303 b: refs/heads/master c: 13bfb34c10fae6016710f5f070043c8b94b40583 h: refs/heads/master i: 11301: fa6db6a1471645da292371c5ea76ef4b41f24da4 11299: 4d6e759e3f4e84f6845d017b309559bf8e0b7cc0 11295: a75d3b4ca1379a4c938c000afee05b3073c0b5f2 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/maps/sa1100-flash.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 81e6c28936cf..d778ad7397fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 183e1a349466a1b90430a58f3efad25a3e555cb2 +refs/heads/master: 13bfb34c10fae6016710f5f070043c8b94b40583 diff --git a/trunk/drivers/mtd/maps/sa1100-flash.c b/trunk/drivers/mtd/maps/sa1100-flash.c index acf01ef9b575..c81bec7b14d5 100644 --- a/trunk/drivers/mtd/maps/sa1100-flash.c +++ b/trunk/drivers/mtd/maps/sa1100-flash.c @@ -440,9 +440,17 @@ static int sa1100_mtd_resume(struct device *dev) info->mtd->resume(info->mtd); return 0; } + +static void sa1100_mtd_shutdown(struct device *dev) +{ + struct sa_info *info = dev_get_drvdata(dev); + if (info && info->mtd->suspend(info->mtd) == 0) + info->mtd->resume(info->mtd); +} #else #define sa1100_mtd_suspend NULL #define sa1100_mtd_resume NULL +#define sa1100_mtd_shutdown NULL #endif static struct device_driver sa1100_mtd_driver = { @@ -452,6 +460,7 @@ static struct device_driver sa1100_mtd_driver = { .remove = __exit_p(sa1100_mtd_remove), .suspend = sa1100_mtd_suspend, .resume = sa1100_mtd_resume, + .shutdown = sa1100_mtd_shutdown, }; static int __init sa1100_mtd_init(void)