lkml.org 
[lkml]   [2014]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.15 005/109] ALSA: hda - Fix broken PM due to incomplete i915 initialization
    Date
    3.15-stable review patch.  If anyone has any objections, please let me know.

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

    From: Takashi Iwai <tiwai@suse.de>

    commit 4da63c6fc426023d1a20e45508c47d7d68c6a53d upstream.

    When the initialization of Intel HDMI controller fails due to missing
    i915 kernel symbols (e.g. HD-audio is built in while i915 is module),
    the driver discontinues the probe. However, since the probe was done
    asynchronously, the driver object still remains, thus the relevant PM
    ops are still called at suspend/resume. This results in the bad access
    to the incomplete audio card object, eventually leads to Oops or stall
    at PM.

    This patch adds the missing checks of chip->init_failed flag at each
    PM callback in order to fix the problem above.

    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=79561
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/pci/hda/hda_intel.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/sound/pci/hda/hda_intel.c
    +++ b/sound/pci/hda/hda_intel.c
    @@ -590,7 +590,7 @@ static int azx_suspend(struct device *de
    struct azx *chip = card->private_data;
    struct azx_pcm *p;

    - if (chip->disabled)
    + if (chip->disabled || chip->init_failed)
    return 0;

    snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
    @@ -622,7 +622,7 @@ static int azx_resume(struct device *dev
    struct snd_card *card = dev_get_drvdata(dev);
    struct azx *chip = card->private_data;

    - if (chip->disabled)
    + if (chip->disabled || chip->init_failed)
    return 0;

    if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
    @@ -659,7 +659,7 @@ static int azx_runtime_suspend(struct de
    struct snd_card *card = dev_get_drvdata(dev);
    struct azx *chip = card->private_data;

    - if (chip->disabled)
    + if (chip->disabled || chip->init_failed)
    return 0;

    if (!(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
    @@ -686,7 +686,7 @@ static int azx_runtime_resume(struct dev
    struct hda_codec *codec;
    int status;

    - if (chip->disabled)
    + if (chip->disabled || chip->init_failed)
    return 0;

    if (!(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
    @@ -723,7 +723,7 @@ static int azx_runtime_idle(struct devic
    struct snd_card *card = dev_get_drvdata(dev);
    struct azx *chip = card->private_data;

    - if (chip->disabled)
    + if (chip->disabled || chip->init_failed)
    return 0;

    if (!power_save_controller ||



    \
     
     \ /
      Last update: 2014-07-26 22:01    [W:4.142 / U:0.416 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site