From patchwork Tue Jan 24 18:09:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Lucid, SRU] Revert "ARM: 7220/1: mmc: mmci: Fixup error handling for dma" Date: Tue, 24 Jan 2012 08:09:34 -0000 From: Herton Ronaldo Krzesinski X-Patchwork-Id: 137607 Message-Id: <1327428574-10915-1-git-send-email-herton.krzesinski@canonical.com> To: kernel-team@lists.ubuntu.com From: Herton Ronaldo Krzesinski This reverts commit c8cdf3f97d34d906e0519d5cbc2ab3f81269d0b4, applied on linux 2.6.32.53 stable release, as it can introduce the following build error while building 2.6.32.y on armel: linux-2.6.32/drivers/mmc/host/mmci.c: In function 'mmci_cmd_irq': linux-2.6.32/drivers/mmc/host/mmci.c:237: error: implicit declaration of function 'dma_inprogress' linux-2.6.32/drivers/mmc/host/mmci.c:238: error: implicit declaration of function 'mmci_dma_data_error' Aparently the commit was wrongly pushed into 2.6.32, since it depends on commit c8ebae37 ("ARM: mmci: add dmaengine-based DMA support"), not present on 2.6.32. BugLink: https://bugs.launchpad.net/bugs/921113 Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Stefan Bader --- drivers/mmc/host/mmci.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 68d800f..705a589 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -232,12 +232,8 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd, } if (!cmd->data || cmd->error) { - if (host->data) { - /* Terminate the DMA transfer */ - if (dma_inprogress(host)) - mmci_dma_data_error(host); + if (host->data) mmci_stop_data(host); - } mmci_request_end(host, cmd->mrq); } else if (!(cmd->data->flags & MMC_DATA_READ)) { mmci_start_data(host, cmd->data);