From 46a144818acd8b340bdc6ccf12255c7fb301f0ee Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 7 Feb 2013 09:58:11 +0100 Subject: ALSA: hda - Enable loopback accounts for CONFIG_PM=n, too The loopback list is referred by the VIA codec driver no matter whether CONFIG_PM is set or not, thus we need to enable it always. Otherwise it gets compile errors. Reported-by: Randy Dunlap Signed-off-by: Takashi Iwai --- sound/pci/hda/hda_generic.c | 4 ---- sound/pci/hda/hda_generic.h | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'sound/pci') diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index c4ba3066a013..c2cd3d6b6003 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -2483,7 +2483,6 @@ static int create_in_jack_mode(struct hda_codec *codec, hda_nid_t pin) * Parse input paths */ -#ifdef CONFIG_PM /* add the powersave loopback-list entry */ static void add_loopback_list(struct hda_gen_spec *spec, hda_nid_t mix, int idx) { @@ -2498,9 +2497,6 @@ static void add_loopback_list(struct hda_gen_spec *spec, hda_nid_t mix, int idx) spec->num_loopbacks++; spec->loopback.amplist = spec->loopback_list; } -#else -#define add_loopback_list(spec, mix, idx) /* NOP */ -#endif /* create input playback/capture controls for the given pin */ static int new_analog_input(struct hda_codec *codec, int input_idx, diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 065fcc77b860..d5348dd7a14f 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -226,11 +226,10 @@ struct hda_gen_spec { hda_nid_t vmaster_nid; unsigned int vmaster_tlv[4]; struct hda_vmaster_mute_hook vmaster_mute; -#ifdef CONFIG_PM + struct hda_loopback_check loopback; int num_loopbacks; struct hda_amp_list loopback_list[8]; -#endif /* multi-io */ int multi_ios; -- cgit v1.2.3-59-g8ed1b