From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE17EECE563 for ; Mon, 17 Sep 2018 06:23:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7153D214C4 for ; Mon, 17 Sep 2018 06:23:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7153D214C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728512AbeIQLtB (ORCPT ); Mon, 17 Sep 2018 07:49:01 -0400 Received: from mga03.intel.com ([134.134.136.65]:15111 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727130AbeIQLtB (ORCPT ); Mon, 17 Sep 2018 07:49:01 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Sep 2018 23:23:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,384,1531810800"; d="scan'208";a="263188827" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.98]) ([10.237.72.98]) by fmsmga005.fm.intel.com with ESMTP; 16 Sep 2018 23:23:03 -0700 Subject: Re: [PATCH mmc-next] mmc: sdhci: fix __sdhci_adma_write_desc To: Jisheng Zhang , Ulf Hansson Cc: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20180917133041.66100101@xhacker.debian> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <0bec0d01-9fde-1df3-3cc3-fb922dd5350d@intel.com> Date: Mon, 17 Sep 2018 09:21:16 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20180917133041.66100101@xhacker.debian> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 17/09/18 08:30, Jisheng Zhang wrote: > If hosts provides ops->adma_write_desc, we should not fall back to the > general sdhci_adma_write_desc(). > > Signed-off-by: Jisheng Zhang > --- > > Hi Ulf, Adrian, > > When I introduced .adma_write_desc, I made a mistake since v4 -- if the host > provide ops->adma_write_desc, we should just call it and don't fall back > to the general sdhci_adma_write_desc(). Before v4, the adma_write_desc return > int, since v4 there's no return value, so when I prepared the v4, I just > removed return, this is where the mistake is from. I dunno how to handle > this case, fold the patch into previous commit or apply it as a separate patch? Up to Ulf, but in any case: Acked-by: Adrian Hunter > > I'm very sorry for this. In fact, Adrian caught another similar bug during > review. > > Sorry about the inconvenience, > Jisheng > > drivers/mmc/host/sdhci.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index 0dda6f4b6a24..99bdae53fa2e 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -649,8 +649,8 @@ static inline void __sdhci_adma_write_desc(struct sdhci_host *host, > { > if (host->ops->adma_write_desc) > host->ops->adma_write_desc(host, desc, addr, len, cmd); > - > - sdhci_adma_write_desc(host, desc, addr, len, cmd); > + else > + sdhci_adma_write_desc(host, desc, addr, len, cmd); > } > > static void sdhci_adma_mark_end(void *desc) >