diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-19 08:21:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-19 08:21:57 +0200 |
| commit | 1558eb838ff502faafacf26b6a711dbaae796009 (patch) | |
| tree | 8049ea20a214033369725ed58b8b4a3ca4110887 /sound/pci/hda/hda_codec.c | |
| parent | 4609ed6b1f0ab9f11a9d0361573b53d9d057c440 (diff) | |
| parent | 81fcb170852d58d7ebd8101a8ef970c82056426e (diff) | |
Merge branch 'topic/pm-convert' into for-next
This merges the changes for converting to new PM ops for platform
and some other drivers.
Also move some header files to local places from the public
include/sound.
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 20580bf6969..88a9c20eb7a 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3556,7 +3556,7 @@ static inline void hda_exec_init_verbs(struct hda_codec *codec) {} static void hda_call_codec_suspend(struct hda_codec *codec) { if (codec->patch_ops.suspend) - codec->patch_ops.suspend(codec, PMSG_SUSPEND); + codec->patch_ops.suspend(codec); hda_cleanup_all_streams(codec); hda_set_power_state(codec, codec->afg ? codec->afg : codec->mfg, |