| Submitter | Russell King - ARM Linux |
|---|---|
| Date | Jan. 20, 2012, 10:42 a.m. |
| Message ID | <E1RoBvE-0005qY-BC@rmk-PC.arm.linux.org.uk> |
| Download | mbox | patch |
| Permalink | /patch/136997/ |
| State | New |
| Headers | show |
Comments
On Fri, 2012-01-20 at 10:42 +0000, Russell King - ARM Linux wrote: > Commit c4a9f88daf ([MTD] [NOR] fix ctrl-alt-del can't reboot for > intel flash bug) interferes with this work-around, causing MTD to > issue this warning: > > Flash device refused suspend due to active operation (state 0) > > The commit makes our work-around in the map driver unnecessary, so > let's remove it. > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Pushed both to l2-mtd tree, thanks!
Patch
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c index 5028219..c735569 100644 --- a/drivers/mtd/maps/sa1100-flash.c +++ b/drivers/mtd/maps/sa1100-flash.c @@ -373,21 +373,9 @@ static int __exit sa1100_mtd_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM -static void sa1100_mtd_shutdown(struct platform_device *dev) -{ - struct sa_info *info = platform_get_drvdata(dev); - if (info && mtd_suspend(info->mtd) == 0) - mtd_resume(info->mtd); -} -#else -#define sa1100_mtd_shutdown NULL -#endif - static struct platform_driver sa1100_mtd_driver = { .probe = sa1100_mtd_probe, .remove = __exit_p(sa1100_mtd_remove), - .shutdown = sa1100_mtd_shutdown, .driver = { .name = "sa1100-mtd", .owner = THIS_MODULE,
Commit c4a9f88daf ([MTD] [NOR] fix ctrl-alt-del can't reboot for intel flash bug) interferes with this work-around, causing MTD to issue this warning: Flash device refused suspend due to active operation (state 0) The commit makes our work-around in the map driver unnecessary, so let's remove it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- drivers/mtd/maps/sa1100-flash.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-)