Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
f6450739
L
linux
项目概览
xiphi1978
/
linux
通知
2
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,发现更多精彩内容 >>
提交
f6450739
编写于
11月 08, 2009
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/misc' into for-linus
上级
6fc786d5
f37325a9
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
14 addition
and
5 deletion
+14
-5
sound/oss/dmasound/dmasound_core.c
sound/oss/dmasound/dmasound_core.c
+3
-1
sound/oss/sb_common.c
sound/oss/sb_common.c
+2
-2
sound/oss/sb_ess.c
sound/oss/sb_ess.c
+1
-1
sound/pci/intel8x0.c
sound/pci/intel8x0.c
+6
-0
sound/sh/aica.c
sound/sh/aica.c
+1
-0
sound/usb/usbaudio.h
sound/usb/usbaudio.h
+1
-1
未找到文件。
sound/oss/dmasound/dmasound_core.c
浏览文件 @
f6450739
...
...
@@ -219,7 +219,9 @@ static int shared_resources_initialised;
* Mid level stuff
*/
struct
sound_settings
dmasound
=
{
.
lock
=
SPIN_LOCK_UNLOCKED
};
struct
sound_settings
dmasound
=
{
.
lock
=
__SPIN_LOCK_UNLOCKED
(
dmasound
.
lock
)
};
static
inline
void
sound_silence
(
void
)
{
...
...
sound/oss/sb_common.c
浏览文件 @
f6450739
...
...
@@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc)
break
;
default:
/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
/* printk(KERN_WARN
ING
"Sound Blaster: Unexpected interrupt\n"); */
;
}
}
...
...
@@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc)
break
;
default:
/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
/* printk(KERN_WARN
ING
"Sound Blaster: Unexpected interrupt\n"); */
;
}
}
...
...
sound/oss/sb_ess.c
浏览文件 @
f6450739
...
...
@@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode);
break
;
default:
;
/* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */
/* printk(KERN_WARN
ING
"ESS: Unexpected interrupt\n"); */
}
}
...
...
sound/pci/intel8x0.c
浏览文件 @
f6450739
...
...
@@ -1948,6 +1948,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
.
name
=
"HP xw4200"
,
/* AD1981B*/
.
type
=
AC97_TUNE_HP_ONLY
},
{
.
subvendor
=
0x104d
,
.
subdevice
=
0x8144
,
.
name
=
"Sony"
,
.
type
=
AC97_TUNE_INV_EAPD
},
{
.
subvendor
=
0x104d
,
.
subdevice
=
0x8197
,
...
...
sound/sh/aica.c
浏览文件 @
f6450739
...
...
@@ -49,6 +49,7 @@ MODULE_AUTHOR("Adrian McMenamin <adrian@mcmen.demon.co.uk>");
MODULE_DESCRIPTION
(
"Dreamcast AICA sound (pcm) driver"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_SUPPORTED_DEVICE
(
"{{Yamaha/SEGA, AICA}}"
);
MODULE_FIRMWARE
(
"aica_firmware.bin"
);
/* module parameters */
#define CARD_NAME "AICA"
...
...
sound/usb/usbaudio.h
浏览文件 @
f6450739
...
...
@@ -210,7 +210,7 @@ struct snd_usb_midi_endpoint_info {
/*
*/
#define combine_word(s) ((*
s
) | ((unsigned int)(s)[1] << 8))
#define combine_word(s) ((*
(s)
) | ((unsigned int)(s)[1] << 8))
#define combine_triple(s) (combine_word(s) | ((unsigned int)(s)[2] << 16))
#define combine_quad(s) (combine_triple(s) | ((unsigned int)(s)[3] << 24))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录