diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-06-09 07:22:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-06-09 07:22:26 +0200 |
| commit | 8654844cf51d434dad5d4d9f48dc99d1ac89aad7 (patch) | |
| tree | ce1ad2eb865c6f5e15b4f7f119e05e439d675a53 /sound/pci/hda/patch_via.c | |
| parent | 01ec65c812ef829c815d2f37a97cc4eb7925f8ae (diff) | |
| parent | 132bd96bc56f9cafd24b71de389984d0e83a0956 (diff) | |
| download | linux-stable-8654844cf51d434dad5d4d9f48dc99d1ac89aad7.tar.gz linux-stable-8654844cf51d434dad5d4d9f48dc99d1ac89aad7.tar.bz2 linux-stable-8654844cf51d434dad5d4d9f48dc99d1ac89aad7.zip | |
Merge branch 'for-linus' into for-next
Resolve the non-trivial conflict due to the hdac regmap API changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_via.c')
| -rw-r--r-- | sound/pci/hda/patch_via.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 2c6c6727ca93..0521be8d46a8 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -452,6 +452,15 @@ static int via_suspend(struct hda_codec *codec) return 0; } + +static int via_resume(struct hda_codec *codec) +{ + /* some delay here to make jack detection working (bko#98921) */ + msleep(10); + codec->patch_ops.init(codec); + regcache_sync(codec->core.regmap); + return 0; +} #endif #ifdef CONFIG_PM @@ -477,6 +486,7 @@ static const struct hda_codec_ops via_patch_ops = { .unsol_event = snd_hda_jack_unsol_event, #ifdef CONFIG_PM .suspend = via_suspend, + .resume = via_resume, .check_power_status = via_check_power_status, #endif }; |