ALSA: hda - Don't enable beep for digital-only ALC262
authorTakashi Iwai <tiwai@suse.de>
Thu, 19 Feb 2009 07:06:35 +0000 (08:06 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 19 Feb 2009 07:06:35 +0000 (08:06 +0100)
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>
sound/pci/hda/patch_realtek.c

index 192c92a5af380bdb09a1dab4f100945d3fabb606..91da92259c8039a48e0869df61816392565d498f 100644 (file)
@@ -11051,10 +11051,12 @@ static int patch_alc262(struct hda_codec *codec)
                }
        }
 
-       err = snd_hda_attach_beep_device(codec, 0x1);
-       if (err < 0) {
-               alc_free(codec);
-               return err;
+       if (!spec->no_analog) {
+               err = snd_hda_attach_beep_device(codec, 0x1);
+               if (err < 0) {
+                       alc_free(codec);
+                       return err;
+               }
        }
 
        if (board_config != ALC262_AUTO)
@@ -11087,7 +11089,8 @@ static int patch_alc262(struct hda_codec *codec)
        }
        if (!spec->cap_mixer && !spec->no_analog)
                set_capture_mixer(spec);
-       set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
+       if (!spec->no_analog)
+               set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
 
        spec->vmaster_nid = 0x0c;