diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-06 10:39:43 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-06 10:39:43 +0400 |
| commit | 20d157aef2e5bc6ac8995e8babefdc6e1cfaaadf (patch) | |
| tree | 21d3b7e1d5edc8903b3936c37561c63c3864250f /sound/pci/hda/patch_analog.c | |
| parent | 7b2bfdbc0dee5a321b5c02febe157adebd33ab3a (diff) | |
| parent | 8f0f5ff6777104084b4b2e1ae079541c2a6ed6d9 (diff) | |
| download | linux-20d157aef2e5bc6ac8995e8babefdc6e1cfaaadf.tar.xz | |
Merge branch 'fix/hda' into topic/hda
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 9cbd80cba122..afbe314a5bf3 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -527,14 +527,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 = { @@ -547,7 +539,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, }; |