aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/pci/hda/patch_analog.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-04-23 17:10:44 +0200
committerTakashi Iwai <tiwai@suse.de>2010-04-23 17:10:44 +0200
commit1f10cd34d9b347106cb34ef91c8ff76f12ee67a8 (patch)
tree986f94e5b93ce612d0169ee6a9bb93eb98834eb7 /sound/pci/hda/patch_analog.c
parentMerge branch 'fix/hda' into for-linus (diff)
parentALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio 1558 (diff)
downloadwireguard-linux-1f10cd34d9b347106cb34ef91c8ff76f12ee67a8.tar.xz
wireguard-linux-1f10cd34d9b347106cb34ef91c8ff76f12ee67a8.zip
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
-rw-r--r--sound/pci/hda/patch_analog.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index af34606c30c3..e9fdfc4b1c57 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -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,
};