mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 13:13:57 +08:00
ALSA: hda - Fix resume from StR of HP 2510p with docking-station
When HP laptop with AD1981 codec is suspended and the docking-station
is connected before the resume, the outputs get confused, and wrongly
routed still to the speaker. This is because of a change in 2.6.34-rc1
ea52bf260e
ALSA: hda: Add powerdown for Analog Devices HDA codecs
The problem was the added resume callback that doesn't consider the
modified init hook. The fix is simply remove the resume callback here
and make the resume normally. This doesn't change any behavior intended
in the commit above (for shutting down the sound at suspend) but only
fixes the resume.
Reported-and-tested-by: Frans Pop <elendil@planet.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
8815cd030f
commit
b7d2526f5c
@ -519,14 +519,6 @@ static int ad198x_suspend(struct hda_codec *codec, pm_message_t state)
|
||||
ad198x_power_eapd(codec);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ad198x_resume(struct hda_codec *codec)
|
||||
{
|
||||
ad198x_init(codec);
|
||||
snd_hda_codec_resume_amp(codec);
|
||||
snd_hda_codec_resume_cache(codec);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static struct hda_codec_ops ad198x_patch_ops = {
|
||||
@ -539,7 +531,6 @@ static struct hda_codec_ops ad198x_patch_ops = {
|
||||
#endif
|
||||
#ifdef SND_HDA_NEEDS_RESUME
|
||||
.suspend = ad198x_suspend,
|
||||
.resume = ad198x_resume,
|
||||
#endif
|
||||
.reboot_notify = ad198x_shutup,
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user