aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_realtek.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-19 02:06:35 -0500
committerTakashi Iwai <tiwai@suse.de>2009-02-19 02:06:35 -0500
commit07eba61dd68678e30b24b4776f59798f625e089d (patch)
treeb11119ce0618fff0290956b7942a3258579f0b78 /sound/pci/hda/patch_realtek.c
parentb3bdb30b6d1989129e297641fec791e9e555e4d8 (diff)
ALSA: hda - Don't enable beep for digital-only ALC262
When ALC262 codec is configured as digital-only, it's meaningless to add the digital beep input. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r--sound/pci/hda/patch_realtek.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 192c92a5af38..91da92259c80 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -11051,10 +11051,12 @@ static int patch_alc262(struct hda_codec *codec)
11051 } 11051 }
11052 } 11052 }
11053 11053
11054 err = snd_hda_attach_beep_device(codec, 0x1); 11054 if (!spec->no_analog) {
11055 if (err < 0) { 11055 err = snd_hda_attach_beep_device(codec, 0x1);
11056 alc_free(codec); 11056 if (err < 0) {
11057 return err; 11057 alc_free(codec);
11058 return err;
11059 }
11058 } 11060 }
11059 11061
11060 if (board_config != ALC262_AUTO) 11062 if (board_config != ALC262_AUTO)
@@ -11087,7 +11089,8 @@ static int patch_alc262(struct hda_codec *codec)
11087 } 11089 }
11088 if (!spec->cap_mixer && !spec->no_analog) 11090 if (!spec->cap_mixer && !spec->no_analog)
11089 set_capture_mixer(spec); 11091 set_capture_mixer(spec);
11090 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); 11092 if (!spec->no_analog)
11093 set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
11091 11094
11092 spec->vmaster_nid = 0x0c; 11095 spec->vmaster_nid = 0x0c;
11093 11096