diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 08:37:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 08:37:23 -0700 |
| commit | 101e4d91f5e8c78d64970c03323d942d6706320f (patch) | |
| tree | ce0e6a0a172ee9fbe638a60c124512bac8373dbc /sound/pci/hda/patch_analog.c | |
| parent | 2f2c2679893c963bd90c5e1c0669b97fd87d1c4a (diff) | |
| parent | 9efbf95f6204da0112371f41e63c7330f94e1042 (diff) | |
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
[ALSA] version 1.0.15
[ALSA] hda-codec - Fix possible array overflow
[ALSA] sound/core/control.c: hard-irq-safe -> hard-irq-unsafe lock warning
[ALSA] usb-audio: Another USB mic quirk for Logitech Communicator webcam
[ALSA] hda-codec - Fix build without CONFIG_SND_HDA_GENERIC
[ALSA] hda-codec - Fix Conexant 5045 volumes
[ALSA] hda-codec - Fix conflict of Master volume in STAC92xx codec
[ALSA] snd-bt87x: Make the load_all option work correctly
[ALSA] protect Dreamcast PCM driver (AICA) from G2 bus effects
[ALSA] bt87x - Fix section mismatch
[ALSA] hda-codec - Fix AD1986A Lenovo auto-mute
[ALSA] This simplifies and fixes waiting loops of the mce_down()
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 54cfd4526d2..0ee8ae4d441 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -72,7 +72,7 @@ struct ad198x_spec { unsigned int num_kctl_alloc, num_kctl_used; struct snd_kcontrol_new *kctl_alloc; struct hda_input_mux private_imux; - hda_nid_t private_dac_nids[4]; + hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS]; unsigned int jack_present :1; @@ -612,7 +612,8 @@ static void ad1986a_hp_automute(struct hda_codec *codec) unsigned int present; present = snd_hda_codec_read(codec, 0x1a, 0, AC_VERB_GET_PIN_SENSE, 0); - spec->jack_present = (present & 0x80000000) != 0; + /* Lenovo N100 seems to report the reversed bit for HP jack-sensing */ + spec->jack_present = !(present & 0x80000000); ad1986a_update_hp(codec); } |