diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-09 13:23:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-09 13:23:45 -0400 |
| commit | d563923011110a91bdbf1d89055c3e803ec01f0f (patch) | |
| tree | eefa29037a7f4773c8c169c783e97b6e6fb794cd | |
| parent | 64a3dcd5d33d0c5253de2eba31b28a197d3e5e6b (diff) | |
| parent | 7b1e8795ebfe1705153d1001f2a899119f4d9012 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] hda - Fix "alc262_sony_unsol[]" hda_verb array
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 518b7cab5102..b0a2a262ece2 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -8642,6 +8642,7 @@ static struct hda_verb alc262_sony_unsol_verbs[] = { | |||
| 8642 | 8642 | ||
| 8643 | {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT}, | 8643 | {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT}, |
| 8644 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | 8644 | {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, |
| 8645 | {} | ||
| 8645 | }; | 8646 | }; |
| 8646 | 8647 | ||
| 8647 | /* mute/unmute internal speaker according to the hp jack and mute state */ | 8648 | /* mute/unmute internal speaker according to the hp jack and mute state */ |