aboutsummaryrefslogtreecommitdiff
path: root/sound/pci/hda
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-02-07 09:58:11 +0100
committerTakashi Iwai <tiwai@suse.de>2013-02-07 09:59:26 +0100
commit46a144818acd8b340bdc6ccf12255c7fb301f0ee (patch)
tree73f8f515a6eabd7203715ab8e45d40cb42eaf476 /sound/pci/hda
parentb57a895fa2188d4e1cefa030d0fc9d126e453a95 (diff)
downloadvexpress-lsk-46a144818acd8b340bdc6ccf12255c7fb301f0ee.tar.gz
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 <rdunlap@infradead.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r--sound/pci/hda/hda_generic.c4
-rw-r--r--sound/pci/hda/hda_generic.h3
2 files changed, 1 insertions, 6 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index c4ba3066a01..c2cd3d6b600 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 065fcc77b86..d5348dd7a14 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;