lkml.org 
[lkml]   [2016]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 049/268] mmc: sdhci: Fix sdhci_runtime_pm_bus_on/off()
    Date
    4.2.8-ckt3 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Adrian Hunter <adrian.hunter@intel.com>

    commit 5c671c410c8704800f4f1673b6f572137e7e6ddd upstream.

    sdhci has a legacy facility to prevent runtime suspend if the
    bus power is on. This is needed in cases where the power to
    the card is dependent on the bus power. It is controlled by
    a pair of functions: sdhci_runtime_pm_bus_on() and
    sdhci_runtime_pm_bus_off(). These functions use a boolean
    variable 'bus_on' to ensure changes are always paired.
    There is an additional check for 'runtime_suspended' which is
    the problem. In fact, its use is ill-conceived as the only
    requirement for the logic is that 'on' and 'off' are paired,
    which is actually broken by the check, for example if the bus
    power is turned on during runtime resume. So remove the check.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    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 1c4343d..cf31efa 100644
    --- a/drivers/mmc/host/sdhci.c
    +++ b/drivers/mmc/host/sdhci.c
    @@ -2741,7 +2741,7 @@ static int sdhci_runtime_pm_put(struct sdhci_host *host)

    static void sdhci_runtime_pm_bus_on(struct sdhci_host *host)
    {
    - if (host->runtime_suspended || host->bus_on)
    + if (host->bus_on)
    return;
    host->bus_on = true;
    pm_runtime_get_noresume(host->mmc->parent);
    @@ -2749,7 +2749,7 @@ static void sdhci_runtime_pm_bus_on(struct sdhci_host *host)

    static void sdhci_runtime_pm_bus_off(struct sdhci_host *host)
    {
    - if (host->runtime_suspended || !host->bus_on)
    + if (!host->bus_on)
    return;
    host->bus_on = false;
    pm_runtime_put_noidle(host->mmc->parent);
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-01-27 23:21    [W:4.068 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site