Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
e04dd2d2
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e04dd2d2
编写于
3月 17, 2010
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/hda' into for-linus
上级
2a5e00ed
572c0e3c
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
16 addition
and
3 deletion
+16
-3
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_codec.c
+3
-1
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_intel.c
+9
-0
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c
+4
-2
未找到文件。
sound/pci/hda/hda_codec.c
浏览文件 @
e04dd2d2
...
...
@@ -1806,6 +1806,8 @@ int snd_hda_add_nid(struct hda_codec *codec, struct snd_kcontrol *kctl,
item
->
nid
=
nid
;
return
0
;
}
printk
(
KERN_ERR
"hda-codec: no NID for mapping control %s:%d:%d
\n
"
,
kctl
->
id
.
name
,
kctl
->
id
.
index
,
index
);
return
-
EINVAL
;
}
EXPORT_SYMBOL_HDA
(
snd_hda_add_nid
);
...
...
@@ -2884,7 +2886,7 @@ int /*__devinit*/ snd_hda_build_controls(struct hda_bus *bus)
list_for_each_entry
(
codec
,
&
bus
->
codec_list
,
list
)
{
int
err
=
snd_hda_codec_build_controls
(
codec
);
if
(
err
<
0
)
{
printk
(
KERN_ERR
"hda_codec: cannot build controls"
printk
(
KERN_ERR
"hda_codec: cannot build controls
"
"for #%d (error %d)
\n
"
,
codec
->
addr
,
err
);
err
=
snd_hda_codec_reset
(
codec
);
if
(
err
<
0
)
{
...
...
sound/pci/hda/hda_intel.c
浏览文件 @
e04dd2d2
...
...
@@ -2271,6 +2271,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
SND_PCI_QUIRK
(
0x1043
,
0x813d
,
"ASUS P5AD2"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1462
,
0x1002
,
"MSI Wind U115"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1565
,
0x820f
,
"Biostar Microtech"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x8086
,
0xd601
,
"eMachines T5212"
,
POS_FIX_LPIB
),
{}
};
...
...
@@ -2378,6 +2379,13 @@ static void __devinit check_msi(struct azx *chip)
"hda_intel: msi for device %04x:%04x set to %d
\n
"
,
q
->
subvendor
,
q
->
subdevice
,
q
->
value
);
chip
->
msi
=
q
->
value
;
return
;
}
/* NVidia chipsets seem to cause troubles with MSI */
if
(
chip
->
driver_type
==
AZX_DRIVER_NVIDIA
)
{
printk
(
KERN_INFO
"hda_intel: Disable MSI for Nvidia chipset
\n
"
);
chip
->
msi
=
0
;
}
}
...
...
@@ -2706,6 +2714,7 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
{
PCI_DEVICE
(
0x8086
,
0x3a6e
),
.
driver_data
=
AZX_DRIVER_ICH
},
/* PCH */
{
PCI_DEVICE
(
0x8086
,
0x3b56
),
.
driver_data
=
AZX_DRIVER_ICH
},
{
PCI_DEVICE
(
0x8086
,
0x3b57
),
.
driver_data
=
AZX_DRIVER_ICH
},
/* CPT */
{
PCI_DEVICE
(
0x8086
,
0x1c20
),
.
driver_data
=
AZX_DRIVER_PCH
},
/* SCH */
...
...
sound/pci/hda/patch_realtek.c
浏览文件 @
e04dd2d2
...
...
@@ -6477,7 +6477,7 @@ static struct alc_config_preset alc260_presets[] = {
.num_dacs = ARRAY_SIZE(alc260_dac_nids),
.dac_nids = alc260_dac_nids,
.num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),
.adc_nids = alc260_adc_nids,
.adc_nids = alc260_
dual_
adc_nids,
.num_channel_mode = ARRAY_SIZE(alc260_modes),
.channel_mode = alc260_modes,
.input_mux = &alc260_capture_source,
...
...
@@ -9195,6 +9195,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
SND_PCI_QUIRK(0x1462, 0x4314, "MSI", ALC883_TARGA_DIG),
SND_PCI_QUIRK(0x1462, 0x4319, "MSI", ALC883_TARGA_DIG),
SND_PCI_QUIRK(0x1462, 0x4324, "MSI", ALC883_TARGA_DIG),
SND_PCI_QUIRK(0x1462, 0x4570, "MSI Wind Top AE2220", ALC883_TARGA_DIG),
SND_PCI_QUIRK(0x1462, 0x6510, "MSI GX620", ALC883_TARGA_8ch_DIG),
SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC883_6ST_DIG),
SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG),
...
...
@@ -9204,6 +9205,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG),
SND_PCI_QUIRK(0x1462, 0x7327, "MSI", ALC883_6ST_DIG),
SND_PCI_QUIRK(0x1462, 0x7350, "MSI", ALC883_6ST_DIG),
SND_PCI_QUIRK(0x1462, 0x7437, "MSI NetOn AP1900", ALC883_TARGA_DIG),
SND_PCI_QUIRK(0x1462, 0xa422, "MSI", ALC883_TARGA_2ch_DIG),
SND_PCI_QUIRK(0x1462, 0xaa08, "MSI", ALC883_TARGA_2ch_DIG),
...
...
@@ -9235,7 +9237,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
SND_PCI_QUIRK(0x8086, 0x0022, "DX58SO", ALC889_INTEL),
SND_PCI_QUIRK(0x8086, 0x0021, "Intel IbexPeak", ALC889A_INTEL),
SND_PCI_QUIRK(0x8086, 0x3b56, "Intel IbexPeak", ALC889A_INTEL),
SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC88
3_3ST_6ch
),
SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC88
2_6ST_DIG
),
{}
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录