From patchwork Wed Oct 20 08:31:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyungmin Park X-Patchwork-Id: 68399 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from canuck.infradead.org (canuck.infradead.org [134.117.69.58]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7D7AEB6F10 for ; Wed, 20 Oct 2010 19:38:20 +1100 (EST) Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1P8U4s-0008US-Ix; Wed, 20 Oct 2010 08:31:18 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by canuck.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1P8U4p-0008TZ-8H for linux-mtd@lists.infradead.org; Wed, 20 Oct 2010 08:31:16 +0000 Received: from epmmp2 (mailout1.samsung.com [203.254.224.24]) by mailout1.samsung.com (Sun Java(tm) System Messaging Server 7u3-15.01 64bit (built Feb 12 2010)) with ESMTP id <0LAK00D5XYC09X60@mailout1.samsung.com> for linux-mtd@lists.infradead.org; Wed, 20 Oct 2010 17:31:12 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net ([165.213.149.150]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LAK006V3YC06O@mmp2.samsung.com> for linux-mtd@lists.infradead.org; Wed, 20 Oct 2010 17:31:12 +0900 (KST) Received: from july ([10.89.10.219]) by TNRNDGASPAPP1.tn.corp.samsungelectronics.net with Microsoft SMTPSVC(6.0.3790.4675); Wed, 20 Oct 2010 17:31:10 +0900 Received: by july (sSMTP sendmail emulation); Wed, 20 Oct 2010 17:31:02 +0900 Date: Wed, 20 Oct 2010 17:31:02 +0900 From: Kyungmin Park Subject: [PATCH] mtd: OneNAND: S5PC110: Fix double call suspend & resume function To: linux-mtd@lists.infradead.org Message-id: <20101020083102.GA30414@july> MIME-version: 1.0 Content-disposition: inline User-Agent: Mutt/1.5.17 (2007-11-01) X-OriginalArrivalTime: 20 Oct 2010 08:31:10.0847 (UTC) FILETIME=[264CD8F0:01CB7031] X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20101020_043115_562442_13A85CD5 X-CRM114-Status: GOOD ( 16.59 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [203.254.224.24 listed in list.dnswl.org] Cc: Artem.Bityutskiy@nokia.com, dwmw2@infradead.org X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Kyungmin Park The suspend & resume called from mtd core. So no need to call at driver. Signed-off-by: Kyungmin Park diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c index 214ed1e..0de7a05 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; }