]> git.karo-electronics.de Git - linux-beck.git/commitdiff
mtd: OneNAND: S5PC110: Fix double call suspend & resume function
authorKyungmin Park <kyungmin.park@samsung.com>
Wed, 20 Oct 2010 08:31:02 +0000 (17:31 +0900)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 25 Oct 2010 00:36:14 +0000 (01:36 +0100)
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>
drivers/mtd/onenand/samsung.c

index 214ed1e763b64976c8b4b957cae7a2dec29dd5bc..0de7a05e6de065ecfd90cd465939374c11b12090 100644 (file)
@@ -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;
 }