From patchwork Tue Mar 25 18:51:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 3890031 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 584B9BF540 for ; Tue, 25 Mar 2014 18:53:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9BA7A201F9 for ; Tue, 25 Mar 2014 18:53:14 +0000 (UTC) Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E0C8201BC for ; Tue, 25 Mar 2014 18:53:13 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2PIqA4m020609; Tue, 25 Mar 2014 13:52:10 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2PIq8lQ001258; Tue, 25 Mar 2014 13:52:09 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Tue, 25 Mar 2014 13:52:06 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2PIq5OA022432; Tue, 25 Mar 2014 13:52:05 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id B1AD780627; Tue, 25 Mar 2014 12:52:05 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dlelxv84.itg.ti.com (dlelxv84.itg.ti.com [172.17.0.246]) by linux.omap.com (Postfix) with ESMTP id 47F0880626 for ; Tue, 25 Mar 2014 12:52:04 -0600 (CST) Received: from red.ext.ti.com (red.ext.ti.com [192.94.93.37]) by dlelxv84.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2PIq4ri001942 for ; Tue, 25 Mar 2014 13:52:04 -0500 Received: from mail6.bemta8.messagelabs.com (mail6.bemta8.messagelabs.com [216.82.243.55]) by red.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2PIq1pQ030625 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 25 Mar 2014 13:52:03 -0500 Received: from [216.82.242.147:16961] by server-1.bemta-8.messagelabs.com id 15/AF-24323-150D1335; Tue, 25 Mar 2014 18:52:01 +0000 X-Env-Sender: b.zolnierkie@samsung.com X-Msg-Ref: server-11.tower-95.messagelabs.com!1395773518!24835953!1 X-Originating-IP: [203.254.224.33] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjAzLjI1NC4yMjQuMzMgPT4gMzY3NDY5\n X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27815 invoked from network); 25 Mar 2014 18:52:00 -0000 Received: from mailout3.samsung.com (HELO mailout3.samsung.com) (203.254.224.33) by server-11.tower-95.messagelabs.com with DES-CBC3-SHA encrypted SMTP; 25 Mar 2014 18:52:00 -0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N3000MZM9QMAY90@mailout3.samsung.com> for davinci-linux-open-source@linux.davincidsp.com; Wed, 26 Mar 2014 03:51:58 +0900 (KST) X-AuditID: cbfee61a-b7fb26d00000724f-1c-5331d04e4c3b Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 71.6C.29263.E40D1335; Wed, 26 Mar 2014 03:51:58 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N3000J1S9Q7U6A0@mmp1.samsung.com>; Wed, 26 Mar 2014 03:51:57 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Tejun Heo Subject: [PATCH v4 1/4] ata: ahci_platform: fix ahci_platform_data->suspend method handling Date: Tue, 25 Mar 2014 19:51:38 +0100 Message-ID: <1395773501-6663-2-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395773501-6663-1-git-send-email-b.zolnierkie@samsung.com> References: <1395773501-6663-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJLMWRmVeSWpSXmKPExsVy+t9jAV2/C4bBBof+s1lsnLGe1eLcrQZW izfHpzNZ3FnBbLHp8TVWi2M7HjFZXN41h81if+8GJouG7h52izkzNrNa/Fp+lNFi5cW/zA48 Htdf/Wfy2DnrLrvHplWdbB5zpjWxeJy8cJLFY/OSeo/3+66yefRtWcXo8fTHXmaP4ze2M3l8 3iQXwB3FZZOSmpNZllqkb5fAldF9YhZbwUmuirb365kbGO9wdDFyckgImEi8Xn2IBcIWk7hw bz1bFyMXh5DAIkaJC4+uQTldTBJz999hBqliE7CSmNi+ihHEFhGQlbgy7SEjSBGzQBezxJLZ W8ASwgKxEgsnLGMHsVkEVCXW7/gL1MzBwSvgLnHmKSvENkWJ7mcT2EBsTgEPif/31jGB2EIg JfPms01g5F3AyLCKUTS1ILmgOCk911CvODG3uDQvXS85P3cTIziAn0ntYFzZYHGIUYCDUYmH d8IEw2Ah1sSy4srcQ4wSHMxKIrx/TwKFeFMSK6tSi/Lji0pzUosPMUpzsCiJ8x5otQ4UEkhP LEnNTk0tSC2CyTJxcEo1MPqy75oTvHr5pWUqrXoXdi9zOVDpfLHWeFbWHr66vJPPknvXv2VP eX/03a5LCnu/OR85Nq9SWjYhTf3elrdcH1f/+rnlJteiv6+F2ioFfNKPTshbuTLC8W2HuFbb qTkW0ZF8vfLvtV9Om9w9N8FD5t6sqVq/qoKWiLLuYZnBs3o7j3rLw0apQz+UWIozEg21mIuK EwEecmBPXAIAAA== CC: , , Kevin Hilman , Shiraz Hashim , , , Hans de Goede , , Viresh Kumar , X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Looking at ST SPEAr1340 AHCI code (the only user of the deprecated pdata->suspend and pdata->resume) it is obvious the we should return after calling pdata->suspend() only if the function have returned non-zero return value. The code has been broken since commit 1e70c2 ("ata/ahci_platform: Add clock framework support"). Fix it. Cc: Viresh Kumar Cc: Shiraz Hashim Acked-by: Hans de Goede Signed-off-by: Bartlomiej Zolnierkiewicz --- v4: - no changes v3: - no changes v2: - updated patch description drivers/ata/ahci_platform.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index 70fbf66..7bd6adf 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -521,12 +521,19 @@ int ahci_platform_suspend(struct device *dev) if (rc) return rc; - if (pdata && pdata->suspend) - return pdata->suspend(dev); + if (pdata && pdata->suspend) { + rc = pdata->suspend(dev); + if (rc) + goto resume_host; + } ahci_platform_disable_resources(hpriv); return 0; + +resume_host: + ahci_platform_resume_host(dev); + return rc; } EXPORT_SYMBOL_GPL(ahci_platform_suspend);