lkml.org 
[lkml]   [2013]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 269/272] ALSA: hda - Don't clear the power state at snd_hda_codec_reset()
    Date
    3.11.10.1 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Takashi Iwai <tiwai@suse.de>

    commit d183b4fc463489b6bbe05c99afa0257a6fe578eb upstream.

    snd_hda_codec_reset() is called either in resetting the whole setup at
    error paths or hwdep clear/reconfig sysfs triggers. But all of these
    don't assume that the power has to be off, rather they want to keep
    the power state unchanged (e.g. reconfig_codec() calls the power
    up/down by itself). Thus, unconditionally clearing the power state in
    snd_hda_codec_reset() leads to the inconsistency, confuses the further
    operation. This patch gets rid of the lines doing that bad thing.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    sound/pci/hda/hda_codec.c | 3 ---
    1 file changed, 3 deletions(-)

    diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
    index 96ef7c2..4d30aa6 100644
    --- a/sound/pci/hda/hda_codec.c
    +++ b/sound/pci/hda/hda_codec.c
    @@ -2519,9 +2519,6 @@ int snd_hda_codec_reset(struct hda_codec *codec)
    cancel_delayed_work_sync(&codec->jackpoll_work);
    #ifdef CONFIG_PM
    cancel_delayed_work_sync(&codec->power_work);
    - codec->power_on = 0;
    - codec->power_transition = 0;
    - codec->power_jiffies = jiffies;
    flush_workqueue(bus->workq);
    #endif
    snd_hda_ctls_clear(codec);
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-06 15:01    [W:2.312 / U:1.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site