lkml.org 
[lkml]   [2012]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[42/75] ARM: 7214/1: mmc: mmci: Fixup handling of MCI_STARTBITERR
    3.1-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ulf Hansson <ulf.hansson@stericsson.com>

    commit b63038d6f4ca5d1849ce01d9fc5bb9cb426dec73 upstream.

    The interrupt was previously enabled and then correctly cleared.
    Now we also handle it correctly.

    Tested-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/mmc/host/mmci.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/drivers/mmc/host/mmci.c
    +++ b/drivers/mmc/host/mmci.c
    @@ -673,7 +673,8 @@ mmci_data_irq(struct mmci_host *host, st
    unsigned int status)
    {
    /* First check for errors */
    - if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_TXUNDERRUN|MCI_RXOVERRUN)) {
    + if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_STARTBITERR|
    + MCI_TXUNDERRUN|MCI_RXOVERRUN)) {
    u32 remain, success;

    /* Terminate the DMA transfer */
    @@ -953,8 +954,9 @@ static irqreturn_t mmci_irq(int irq, voi
    dev_dbg(mmc_dev(host->mmc), "irq0 (data+cmd) %08x\n", status);

    data = host->data;
    - if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_TXUNDERRUN|
    - MCI_RXOVERRUN|MCI_DATAEND|MCI_DATABLOCKEND) && data)
    + if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_STARTBITERR|
    + MCI_TXUNDERRUN|MCI_RXOVERRUN|MCI_DATAEND|
    + MCI_DATABLOCKEND) && data)
    mmci_data_irq(host, data, status);

    cmd = host->cmd;



    \
     
     \ /
      Last update: 2012-01-03 23:55    [W:0.019 / U:30.100 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site