Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
a91ddf23
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
160
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
a91ddf23
编写于
8月 20, 2018
作者:
J
Jiri Kosina
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-4.19/upstream' into for-linus
Assorted small driver/core fixes.
上级
78a8ad79
7f342e9c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
30 deletion
+7
-30
drivers/hid/hid-ntrig.c
drivers/hid/hid-ntrig.c
+2
-0
drivers/hid/hid-redragon.c
drivers/hid/hid-redragon.c
+1
-25
drivers/hid/intel-ish-hid/ishtp/hbm.c
drivers/hid/intel-ish-hid/ishtp/hbm.c
+0
-2
drivers/hid/usbhid/hid-core.c
drivers/hid/usbhid/hid-core.c
+4
-3
未找到文件。
drivers/hid/hid-ntrig.c
浏览文件 @
a91ddf23
...
...
@@ -955,6 +955,8 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id)
ret
=
sysfs_create_group
(
&
hdev
->
dev
.
kobj
,
&
ntrig_attribute_group
);
if
(
ret
)
hid_err
(
hdev
,
"cannot create sysfs group
\n
"
);
return
0
;
err_free:
...
...
drivers/hid/hid-redragon.c
浏览文件 @
a91ddf23
...
...
@@ -44,29 +44,6 @@ static __u8 *redragon_report_fixup(struct hid_device *hdev, __u8 *rdesc,
return
rdesc
;
}
static
int
redragon_probe
(
struct
hid_device
*
dev
,
const
struct
hid_device_id
*
id
)
{
int
ret
;
ret
=
hid_parse
(
dev
);
if
(
ret
)
{
hid_err
(
dev
,
"parse failed
\n
"
);
return
ret
;
}
/* do not register unused input device */
if
(
dev
->
maxapplication
==
1
)
return
0
;
ret
=
hid_hw_start
(
dev
,
HID_CONNECT_DEFAULT
);
if
(
ret
)
{
hid_err
(
dev
,
"hw start failed
\n
"
);
return
ret
;
}
return
0
;
}
static
const
struct
hid_device_id
redragon_devices
[]
=
{
{
HID_USB_DEVICE
(
USB_VENDOR_ID_JESS
,
USB_DEVICE_ID_REDRAGON_ASURA
)},
{}
...
...
@@ -77,8 +54,7 @@ MODULE_DEVICE_TABLE(hid, redragon_devices);
static
struct
hid_driver
redragon_driver
=
{
.
name
=
"redragon"
,
.
id_table
=
redragon_devices
,
.
report_fixup
=
redragon_report_fixup
,
.
probe
=
redragon_probe
.
report_fixup
=
redragon_report_fixup
};
module_hid_driver
(
redragon_driver
);
...
...
drivers/hid/intel-ish-hid/ishtp/hbm.c
浏览文件 @
a91ddf23
...
...
@@ -298,7 +298,6 @@ int ishtp_hbm_cl_flow_control_req(struct ishtp_device *dev,
struct
ishtp_msg_hdr
*
ishtp_hdr
=
&
hdr
;
const
size_t
len
=
sizeof
(
struct
hbm_flow_control
);
int
rv
;
unsigned
int
num_frags
;
unsigned
long
flags
;
spin_lock_irqsave
(
&
cl
->
fc_spinlock
,
flags
);
...
...
@@ -314,7 +313,6 @@ int ishtp_hbm_cl_flow_control_req(struct ishtp_device *dev,
return
0
;
}
num_frags
=
cl
->
recv_msg_num_frags
;
cl
->
recv_msg_num_frags
=
0
;
rv
=
ishtp_write_message
(
dev
,
ishtp_hdr
,
data
);
...
...
drivers/hid/usbhid/hid-core.c
浏览文件 @
a91ddf23
...
...
@@ -480,6 +480,7 @@ static void hid_ctrl(struct urb *urb)
{
struct
hid_device
*
hid
=
urb
->
context
;
struct
usbhid_device
*
usbhid
=
hid
->
driver_data
;
unsigned
long
flags
;
int
unplug
=
0
,
status
=
urb
->
status
;
switch
(
status
)
{
...
...
@@ -501,7 +502,7 @@ static void hid_ctrl(struct urb *urb)
hid_warn
(
urb
->
dev
,
"ctrl urb status %d received
\n
"
,
status
);
}
spin_lock
(
&
usbhid
->
lock
);
spin_lock
_irqsave
(
&
usbhid
->
lock
,
flags
);
if
(
unplug
)
{
usbhid
->
ctrltail
=
usbhid
->
ctrlhead
;
...
...
@@ -511,13 +512,13 @@ static void hid_ctrl(struct urb *urb)
if
(
usbhid
->
ctrlhead
!=
usbhid
->
ctrltail
&&
hid_submit_ctrl
(
hid
)
==
0
)
{
/* Successfully submitted next urb in queue */
spin_unlock
(
&
usbhid
->
lock
);
spin_unlock
_irqrestore
(
&
usbhid
->
lock
,
flags
);
return
;
}
}
clear_bit
(
HID_CTRL_RUNNING
,
&
usbhid
->
iofl
);
spin_unlock
(
&
usbhid
->
lock
);
spin_unlock
_irqrestore
(
&
usbhid
->
lock
,
flags
);
usb_autopm_put_interface_async
(
usbhid
->
intf
);
wake_up
(
&
usbhid
->
wait
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录