diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-23 17:10:44 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-23 17:10:44 +0200 |
| commit | 1f10cd34d9b347106cb34ef91c8ff76f12ee67a8 (patch) | |
| tree | 986f94e5b93ce612d0169ee6a9bb93eb98834eb7 /sound/pci/hda/patch_analog.c | |
| parent | 923125c6503efd3b8779e0df9ec5fcac6acda0b4 (diff) | |
| parent | 5c1bccf645d4ab65e4c7502acb42e8b9afdb5bdc (diff) | |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index af34606c30c..e9fdfc4b1c5 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, }; |