lkml.org 
[lkml]   [2009]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[070/136] [ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume
    2.6.31-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Pavel Machek <pavel@ucw.cz>

    commit 99f329a2ba3c2d07cc90ca9309babf27ddf98bff upstream.

    sharpsl_pm.c code tries to read battery state very early during
    resume, but those battery meters are connected on SPI and that's only
    resumed way later.

    Replace the check with simple checking of battery fatal signal, that
    actually works at this stage.

    Signed-off-by: Pavel Machek <pavel@ucw.cz>
    Tested-by: Stanislav Brabec <utx@penguin.cz>
    Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/arm/mach-pxa/sharpsl_pm.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/arm/mach-pxa/sharpsl_pm.c
    +++ b/arch/arm/mach-pxa/sharpsl_pm.c
    @@ -678,8 +678,8 @@ static int corgi_enter_suspend(unsigned
    dev_dbg(sharpsl_pm.dev, "User triggered wakeup in offline charger.\n");
    }

    - if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) || (sharpsl_fatal_check() < 0) )
    - {
    + if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) ||
    + (!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_FATAL))) {
    dev_err(sharpsl_pm.dev, "Fatal condition. Suspend.\n");
    corgi_goto_sleep(alarm_time, alarm_enable, state);
    return 1;



    \
     
     \ /
      Last update: 2009-10-02 04:15    [W:0.022 / U:29.944 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site