git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
sound
/
pci
/
hda
/
patch_analog.c
diff --git
a/sound/pci/hda/patch_analog.c
b/sound/pci/hda/patch_analog.c
index
af34606
..
e9fdfc4
100644
(file)
--- 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;
}
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 = {
#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,
#endif
#ifdef SND_HDA_NEEDS_RESUME
.suspend = ad198x_suspend,
- .resume = ad198x_resume,
#endif
.reboot_notify = ad198x_shutup,
};
#endif
.reboot_notify = ad198x_shutup,
};