lkml.org 
[lkml]   [2012]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/26] mmc: sdhci: panic write: no timeout timer
    Date
    From: Adrian Hunter <adrian.hunter@intel.com>

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
    ---
    drivers/mmc/host/sdhci.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
    index ff72e98..3653494 100644
    --- a/drivers/mmc/host/sdhci.c
    +++ b/drivers/mmc/host/sdhci.c
    @@ -1012,7 +1012,8 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
    mdelay(1);
    }

    - mod_timer(&host->timer, jiffies + 10 * HZ);
    + if (!mmc_am_panic_task(host->mmc))
    + mod_timer(&host->timer, jiffies + 10 * HZ);

    host->cmd = cmd;

    @@ -2117,7 +2118,8 @@ static void sdhci_tasklet_finish(unsigned long param)
    return;
    }

    - del_timer(&host->timer);
    + if (!mmc_am_panic_task(host->mmc))
    + del_timer(&host->timer);

    mrq = host->mrq;

    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-10-23 16:21    [W:3.125 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site