Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
fee807e8
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
fee807e8
编写于
10月 15, 2009
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'eeepc-laptop' into release
上级
f63a9048
b56ab33d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
10 deletion
+21
-10
drivers/platform/x86/eeepc-laptop.c
drivers/platform/x86/eeepc-laptop.c
+21
-10
未找到文件。
drivers/platform/x86/eeepc-laptop.c
浏览文件 @
fee807e8
...
...
@@ -150,6 +150,8 @@ struct eeepc_hotk {
/* The actual device the driver binds to */
static
struct
eeepc_hotk
*
ehotk
;
static
void
eeepc_rfkill_hotplug
(
bool
real
);
/* Platform device/driver */
static
int
eeepc_hotk_thaw
(
struct
device
*
device
);
static
int
eeepc_hotk_restore
(
struct
device
*
device
);
...
...
@@ -343,14 +345,23 @@ static bool eeepc_wlan_rfkill_blocked(void)
static
int
eeepc_rfkill_set
(
void
*
data
,
bool
blocked
)
{
unsigned
long
asl
=
(
unsigned
long
)
data
;
return
set_acpi
(
asl
,
!
blocked
);
int
ret
;
if
(
asl
!=
CM_ASL_WLAN
)
return
set_acpi
(
asl
,
!
blocked
);
/* hack to avoid panic with rt2860sta */
if
(
blocked
)
eeepc_rfkill_hotplug
(
false
);
ret
=
set_acpi
(
asl
,
!
blocked
);
return
ret
;
}
static
const
struct
rfkill_ops
eeepc_rfkill_ops
=
{
.
set_block
=
eeepc_rfkill_set
,
};
static
void
__init
eeepc_enable_camera
(
void
)
static
void
__
dev
init
eeepc_enable_camera
(
void
)
{
/*
* If the following call to set_acpi() fails, it's because there's no
...
...
@@ -643,13 +654,13 @@ static int eeepc_get_adapter_status(struct hotplug_slot *hotplug_slot,
return
0
;
}
static
void
eeepc_rfkill_hotplug
(
void
)
static
void
eeepc_rfkill_hotplug
(
bool
real
)
{
struct
pci_dev
*
dev
;
struct
pci_bus
*
bus
;
bool
blocked
=
eeepc_wlan_rfkill_blocked
()
;
bool
blocked
=
real
?
eeepc_wlan_rfkill_blocked
()
:
true
;
if
(
ehotk
->
wlan_rfkill
)
if
(
real
&&
ehotk
->
wlan_rfkill
)
rfkill_set_sw_state
(
ehotk
->
wlan_rfkill
,
blocked
);
mutex_lock
(
&
ehotk
->
hotplug_lock
);
...
...
@@ -692,7 +703,7 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
if
(
event
!=
ACPI_NOTIFY_BUS_CHECK
)
return
;
eeepc_rfkill_hotplug
();
eeepc_rfkill_hotplug
(
true
);
}
static
void
eeepc_hotk_notify
(
struct
acpi_device
*
device
,
u32
event
)
...
...
@@ -850,7 +861,7 @@ static int eeepc_hotk_restore(struct device *device)
{
/* Refresh both wlan rfkill state and pci hotplug */
if
(
ehotk
->
wlan_rfkill
)
eeepc_rfkill_hotplug
();
eeepc_rfkill_hotplug
(
true
);
if
(
ehotk
->
bluetooth_rfkill
)
rfkill_set_sw_state
(
ehotk
->
bluetooth_rfkill
,
...
...
@@ -993,7 +1004,7 @@ static void eeepc_rfkill_exit(void)
* Refresh pci hotplug in case the rfkill state was changed after
* eeepc_unregister_rfkill_notifier()
*/
eeepc_rfkill_hotplug
();
eeepc_rfkill_hotplug
(
true
);
if
(
ehotk
->
hotplug_slot
)
pci_hp_deregister
(
ehotk
->
hotplug_slot
);
...
...
@@ -1109,7 +1120,7 @@ static int eeepc_rfkill_init(struct device *dev)
* Refresh pci hotplug in case the rfkill state was changed during
* setup.
*/
eeepc_rfkill_hotplug
();
eeepc_rfkill_hotplug
(
true
);
exit:
if
(
result
&&
result
!=
-
ENODEV
)
...
...
@@ -1189,7 +1200,7 @@ static int eeepc_input_init(struct device *dev)
return
0
;
}
static
int
eeepc_hotk_add
(
struct
acpi_device
*
device
)
static
int
__devinit
eeepc_hotk_add
(
struct
acpi_device
*
device
)
{
struct
device
*
dev
;
int
result
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录