From: Jisheng Zhang <Jisheng.Zhang@synaptics.com> To: Adrian Hunter <adrian.hunter@intel.com>, Ulf Hansson <ulf.hansson@linaro.org> Cc: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH mmc-next] mmc: sdhci: fix __sdhci_adma_write_desc Date: Mon, 17 Sep 2018 13:30:41 +0800 [thread overview] Message-ID: <20180917133041.66100101@xhacker.debian> (raw) If hosts provides ops->adma_write_desc, we should not fall back to the general sdhci_adma_write_desc(). Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> --- 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? 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) -- 2.19.0
WARNING: multiple messages have this Message-ID (diff)
From: Jisheng.Zhang@synaptics.com (Jisheng Zhang) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH mmc-next] mmc: sdhci: fix __sdhci_adma_write_desc Date: Mon, 17 Sep 2018 13:30:41 +0800 [thread overview] Message-ID: <20180917133041.66100101@xhacker.debian> (raw) If hosts provides ops->adma_write_desc, we should not fall back to the general sdhci_adma_write_desc(). Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> --- 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? 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) -- 2.19.0
next reply other threads:[~2018-09-17 5:34 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-17 5:30 Jisheng Zhang [this message] 2018-09-17 5:30 ` [PATCH mmc-next] mmc: sdhci: fix __sdhci_adma_write_desc Jisheng Zhang 2018-09-17 6:21 ` Adrian Hunter 2018-09-17 6:21 ` Adrian Hunter 2018-09-17 18:35 ` Ulf Hansson 2018-09-17 18:35 ` Ulf Hansson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180917133041.66100101@xhacker.debian \ --to=jisheng.zhang@synaptics.com \ --cc=adrian.hunter@intel.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=ulf.hansson@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.