lkml.org 
[lkml]   [2016]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.5 192/238] mmc: sdhci: clean up command error handling
    Date
    4.5-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Russell King <rmk+kernel@arm.linux.org.uk>

    commit ec014cbacf6229c583cb832726ca39be1ae3d8c3 upstream.

    Avoid multiple tests while handling a command error; simplify the code.

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    [ Goes with "mmc: sdhci: fix command response CRC error handling" ]
    Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mmc/host/sdhci.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/drivers/mmc/host/sdhci.c
    +++ b/drivers/mmc/host/sdhci.c
    @@ -2323,13 +2323,13 @@ static void sdhci_cmd_irq(struct sdhci_h
    return;
    }

    - if (intmask & SDHCI_INT_TIMEOUT)
    - host->cmd->error = -ETIMEDOUT;
    - else if (intmask & (SDHCI_INT_CRC | SDHCI_INT_END_BIT |
    - SDHCI_INT_INDEX))
    - host->cmd->error = -EILSEQ;
    + if (intmask & (SDHCI_INT_TIMEOUT | SDHCI_INT_CRC |
    + SDHCI_INT_END_BIT | SDHCI_INT_INDEX)) {
    + if (intmask & SDHCI_INT_TIMEOUT)
    + host->cmd->error = -ETIMEDOUT;
    + else
    + host->cmd->error = -EILSEQ;

    - if (host->cmd->error) {
    tasklet_schedule(&host->finish_tasklet);
    return;
    }

    \
     
     \ /
      Last update: 2016-04-10 21:21    [W:4.265 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site