Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
db9c6f84
Commit
db9c6f84
authored
Dec 20, 2011
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/hda' into topic/hda
parents
a1585d76
645e9035
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_intel.c
+3
-1
sound/pci/hda/patch_sigmatel.c
sound/pci/hda/patch_sigmatel.c
+6
-0
No files found.
sound/pci/hda/hda_intel.c
View file @
db9c6f84
...
@@ -2498,6 +2498,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
...
@@ -2498,6 +2498,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
SND_PCI_QUIRK
(
0x1043
,
0x813d
,
"ASUS P5AD2"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1043
,
0x813d
,
"ASUS P5AD2"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1043
,
0x81b3
,
"ASUS"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1043
,
0x81b3
,
"ASUS"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1043
,
0x81e7
,
"ASUS M2V"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1043
,
0x81e7
,
"ASUS M2V"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1043
,
0x83ce
,
"ASUS 1101HA"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x104d
,
0x9069
,
"Sony VPCS11V9E"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x104d
,
0x9069
,
"Sony VPCS11V9E"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1297
,
0x3166
,
"Shuttle"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1297
,
0x3166
,
"Shuttle"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1458
,
0xa022
,
"ga-ma770-ud3"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1458
,
0xa022
,
"ga-ma770-ud3"
,
POS_FIX_LPIB
),
...
@@ -2993,7 +2994,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
...
@@ -2993,7 +2994,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
/* SCH */
/* SCH */
{
PCI_DEVICE
(
0x8086
,
0x811b
),
{
PCI_DEVICE
(
0x8086
,
0x811b
),
.
driver_data
=
AZX_DRIVER_SCH
|
AZX_DCAPS_SCH_SNOOP
|
.
driver_data
=
AZX_DRIVER_SCH
|
AZX_DCAPS_SCH_SNOOP
|
AZX_DCAPS_BUFSIZE
},
AZX_DCAPS_BUFSIZE
|
AZX_DCAPS_POSFIX_LPIB
},
/* Poulsbo */
/* ICH */
{
PCI_DEVICE
(
0x8086
,
0x2668
),
{
PCI_DEVICE
(
0x8086
,
0x2668
),
.
driver_data
=
AZX_DRIVER_ICH
|
AZX_DCAPS_OLD_SSYNC
|
.
driver_data
=
AZX_DRIVER_ICH
|
AZX_DCAPS_OLD_SSYNC
|
AZX_DCAPS_BUFSIZE
},
/* ICH6 */
AZX_DCAPS_BUFSIZE
},
/* ICH6 */
...
...
sound/pci/hda/patch_sigmatel.c
View file @
db9c6f84
...
@@ -4925,6 +4925,12 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity)
...
@@ -4925,6 +4925,12 @@ static int find_mute_led_cfg(struct hda_codec *codec, int default_polarity)
set_hp_led_gpio
(
codec
);
set_hp_led_gpio
(
codec
);
return
1
;
return
1
;
}
}
/* BIOS bug: unfilled OEM string */
if
(
strstr
(
dev
->
name
,
"HP_Mute_LED_P_G"
))
{
set_hp_led_gpio
(
codec
);
spec
->
gpio_led_polarity
=
1
;
return
1
;
}
}
}
/*
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment