lkml.org 
[lkml]   [2016]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.6 166/203] ALSA: hdac_regmap - fix the register access for runtime PM
    Date
    4.6-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jaroslav Kysela <perex@perex.cz>

    commit 8198868f0a283eb23e264951632ce61ec2f82228 upstream.

    Call path:

    1) snd_hdac_power_up_pm()
    2) snd_hdac_power_up()
    3) pm_runtime_get_sync()
    4) __pm_runtime_resume()
    5) rpm_resume()

    The rpm_resume() returns 1 when the device is already active.
    Because the return value is unmodified, the hdac regmap read/write
    functions should allow this value for the retry I/O operation, too.

    Signed-off-by: Jaroslav Kysela <perex@perex.cz>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/hda/hdac_regmap.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/sound/hda/hdac_regmap.c
    +++ b/sound/hda/hdac_regmap.c
    @@ -444,7 +444,7 @@ int snd_hdac_regmap_write_raw(struct hda
    err = reg_raw_write(codec, reg, val);
    if (err == -EAGAIN) {
    err = snd_hdac_power_up_pm(codec);
    - if (!err)
    + if (err >= 0)
    err = reg_raw_write(codec, reg, val);
    snd_hdac_power_down_pm(codec);
    }
    @@ -470,7 +470,7 @@ static int __snd_hdac_regmap_read_raw(st
    err = reg_raw_read(codec, reg, val, uncached);
    if (err == -EAGAIN) {
    err = snd_hdac_power_up_pm(codec);
    - if (!err)
    + if (err >= 0)
    err = reg_raw_read(codec, reg, val, uncached);
    snd_hdac_power_down_pm(codec);
    }

    \
     
     \ /
      Last update: 2016-07-26 00:41    [W:4.206 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site