lkml.org 
[lkml]   [2012]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 112/241] mwifiex: report error to MMC core if we cannot suspend
    Date
    3.5.7.2 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Bing Zhao <bzhao@marvell.com>

    commit dd321acddc3be1371263b8c9e6c6f2af89f63d57 upstream.

    When host_sleep_config command fails we should return error to
    MMC core to indicate the failure for our device.

    The misspelled variable is also removed as it's redundant.

    Signed-off-by: Bing Zhao <bzhao@marvell.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    drivers/net/wireless/mwifiex/sdio.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
    index fc8a9bf..82cf0fa 100644
    --- a/drivers/net/wireless/mwifiex/sdio.c
    +++ b/drivers/net/wireless/mwifiex/sdio.c
    @@ -161,7 +161,6 @@ static int mwifiex_sdio_suspend(struct device *dev)
    struct sdio_mmc_card *card;
    struct mwifiex_adapter *adapter;
    mmc_pm_flag_t pm_flag = 0;
    - int hs_actived = 0;
    int i;
    int ret = 0;

    @@ -188,12 +187,14 @@ static int mwifiex_sdio_suspend(struct device *dev)
    adapter = card->adapter;

    /* Enable the Host Sleep */
    - hs_actived = mwifiex_enable_hs(adapter);
    - if (hs_actived) {
    - pr_debug("cmd: suspend with MMC_PM_KEEP_POWER\n");
    - ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);
    + if (!mwifiex_enable_hs(adapter)) {
    + dev_err(adapter->dev, "cmd: failed to suspend\n");
    + return -EFAULT;
    }

    + dev_dbg(adapter->dev, "cmd: suspend with MMC_PM_KEEP_POWER\n");
    + ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER);
    +
    /* Indicate device suspended */
    adapter->is_suspended = true;

    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-12-13 16:01    [W:4.011 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site