diff options
author | Kyungmin Park <kyungmin.park@samsung.com> | 2010-10-20 04:31:02 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-24 20:36:14 -0400 |
commit | 2316d3bc95ff65b7c0c40c70db83455912cf0328 (patch) | |
tree | ac7218950338ec4c6c48c8d91d9edc6a956b7056 /drivers/mtd | |
parent | cdcf12b211d45bd68acae9d8189275d29d500d12 (diff) |
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 <kyungmin.park@samsung.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/onenand/samsung.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) | |||
1098 | struct onenand_chip *this = mtd->priv; | 1098 | struct onenand_chip *this = mtd->priv; |
1099 | 1099 | ||
1100 | this->wait(mtd, FL_PM_SUSPENDED); | 1100 | this->wait(mtd, FL_PM_SUSPENDED); |
1101 | return mtd->suspend(mtd); | 1101 | return 0; |
1102 | } | 1102 | } |
1103 | 1103 | ||
1104 | static int s3c_pm_ops_resume(struct device *dev) | 1104 | static int s3c_pm_ops_resume(struct device *dev) |
@@ -1107,7 +1107,6 @@ static int s3c_pm_ops_resume(struct device *dev) | |||
1107 | struct mtd_info *mtd = platform_get_drvdata(pdev); | 1107 | struct mtd_info *mtd = platform_get_drvdata(pdev); |
1108 | struct onenand_chip *this = mtd->priv; | 1108 | struct onenand_chip *this = mtd->priv; |
1109 | 1109 | ||
1110 | mtd->resume(mtd); | ||
1111 | this->unlock_all(mtd); | 1110 | this->unlock_all(mtd); |
1112 | return 0; | 1111 | return 0; |
1113 | } | 1112 | } |