Commit 46a14481 authored by Takashi Iwai's avatar Takashi Iwai

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: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b57a895f
...@@ -2483,7 +2483,6 @@ static int create_in_jack_mode(struct hda_codec *codec, hda_nid_t pin) ...@@ -2483,7 +2483,6 @@ static int create_in_jack_mode(struct hda_codec *codec, hda_nid_t pin)
* Parse input paths * Parse input paths
*/ */
#ifdef CONFIG_PM
/* add the powersave loopback-list entry */ /* add the powersave loopback-list entry */
static void add_loopback_list(struct hda_gen_spec *spec, hda_nid_t mix, int idx) 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) ...@@ -2498,9 +2497,6 @@ static void add_loopback_list(struct hda_gen_spec *spec, hda_nid_t mix, int idx)
spec->num_loopbacks++; spec->num_loopbacks++;
spec->loopback.amplist = spec->loopback_list; 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 */ /* create input playback/capture controls for the given pin */
static int new_analog_input(struct hda_codec *codec, int input_idx, static int new_analog_input(struct hda_codec *codec, int input_idx,
......
...@@ -226,11 +226,10 @@ struct hda_gen_spec { ...@@ -226,11 +226,10 @@ struct hda_gen_spec {
hda_nid_t vmaster_nid; hda_nid_t vmaster_nid;
unsigned int vmaster_tlv[4]; unsigned int vmaster_tlv[4];
struct hda_vmaster_mute_hook vmaster_mute; struct hda_vmaster_mute_hook vmaster_mute;
#ifdef CONFIG_PM
struct hda_loopback_check loopback; struct hda_loopback_check loopback;
int num_loopbacks; int num_loopbacks;
struct hda_amp_list loopback_list[8]; struct hda_amp_list loopback_list[8];
#endif
/* multi-io */ /* multi-io */
int multi_ios; int multi_ios;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment