From: Kyungmin Park Date: Wed, 20 Oct 2010 08:31:02 +0000 (+0900) Subject: mtd: OneNAND: S5PC110: Fix double call suspend & resume function X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2316d3bc95ff65b7c0c40c70db83455912cf0328;p=openwrt%2Fstaging%2Fblogic.git mtd: OneNAND: S5PC110: Fix double call suspend & resume function The suspend & resume called from mtd core. So no need to call at driver. Signed-off-by: Kyungmin Park Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse --- diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c index 214ed1e763b6..0de7a05e6de0 100644 --- a/drivers/mtd/onenand/samsung.c +++ b/drivers/mtd/onenand/samsung.c @@ -1098,7 +1098,7 @@ static int s3c_pm_ops_suspend(struct device *dev) struct onenand_chip *this = mtd->priv; this->wait(mtd, FL_PM_SUSPENDED); - return mtd->suspend(mtd); + return 0; } static int s3c_pm_ops_resume(struct device *dev) @@ -1107,7 +1107,6 @@ static int s3c_pm_ops_resume(struct device *dev) struct mtd_info *mtd = platform_get_drvdata(pdev); struct onenand_chip *this = mtd->priv; - mtd->resume(mtd); this->unlock_all(mtd); return 0; }