Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
834fa12c
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
153
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
834fa12c
编写于
2月 20, 2012
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://gitorious.org/linux-can/linux-can
上级
9d4990a2
a7762b10
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
1 deletion
+12
-1
drivers/net/can/sja1000/sja1000.c
drivers/net/can/sja1000/sja1000.c
+12
-1
未找到文件。
drivers/net/can/sja1000/sja1000.c
浏览文件 @
834fa12c
...
@@ -95,11 +95,16 @@ static void sja1000_write_cmdreg(struct sja1000_priv *priv, u8 val)
...
@@ -95,11 +95,16 @@ static void sja1000_write_cmdreg(struct sja1000_priv *priv, u8 val)
spin_unlock_irqrestore
(
&
priv
->
cmdreg_lock
,
flags
);
spin_unlock_irqrestore
(
&
priv
->
cmdreg_lock
,
flags
);
}
}
static
int
sja1000_is_absent
(
struct
sja1000_priv
*
priv
)
{
return
(
priv
->
read_reg
(
priv
,
REG_MOD
)
==
0xFF
);
}
static
int
sja1000_probe_chip
(
struct
net_device
*
dev
)
static
int
sja1000_probe_chip
(
struct
net_device
*
dev
)
{
{
struct
sja1000_priv
*
priv
=
netdev_priv
(
dev
);
struct
sja1000_priv
*
priv
=
netdev_priv
(
dev
);
if
(
priv
->
reg_base
&&
(
priv
->
read_reg
(
priv
,
0
)
==
0xFF
))
{
if
(
priv
->
reg_base
&&
sja1000_is_absent
(
priv
))
{
printk
(
KERN_INFO
"%s: probing @0x%lX failed
\n
"
,
printk
(
KERN_INFO
"%s: probing @0x%lX failed
\n
"
,
DRV_NAME
,
dev
->
base_addr
);
DRV_NAME
,
dev
->
base_addr
);
return
0
;
return
0
;
...
@@ -493,6 +498,9 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
...
@@ -493,6 +498,9 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
while
((
isrc
=
priv
->
read_reg
(
priv
,
REG_IR
))
&&
(
n
<
SJA1000_MAX_IRQ
))
{
while
((
isrc
=
priv
->
read_reg
(
priv
,
REG_IR
))
&&
(
n
<
SJA1000_MAX_IRQ
))
{
n
++
;
n
++
;
status
=
priv
->
read_reg
(
priv
,
REG_SR
);
status
=
priv
->
read_reg
(
priv
,
REG_SR
);
/* check for absent controller due to hw unplug */
if
(
status
==
0xFF
&&
sja1000_is_absent
(
priv
))
return
IRQ_NONE
;
if
(
isrc
&
IRQ_WUI
)
if
(
isrc
&
IRQ_WUI
)
dev_warn
(
dev
->
dev
.
parent
,
"wakeup interrupt
\n
"
);
dev_warn
(
dev
->
dev
.
parent
,
"wakeup interrupt
\n
"
);
...
@@ -509,6 +517,9 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
...
@@ -509,6 +517,9 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)
while
(
status
&
SR_RBS
)
{
while
(
status
&
SR_RBS
)
{
sja1000_rx
(
dev
);
sja1000_rx
(
dev
);
status
=
priv
->
read_reg
(
priv
,
REG_SR
);
status
=
priv
->
read_reg
(
priv
,
REG_SR
);
/* check for absent controller */
if
(
status
==
0xFF
&&
sja1000_is_absent
(
priv
))
return
IRQ_NONE
;
}
}
}
}
if
(
isrc
&
(
IRQ_DOI
|
IRQ_EI
|
IRQ_BEI
|
IRQ_EPI
|
IRQ_ALI
))
{
if
(
isrc
&
(
IRQ_DOI
|
IRQ_EI
|
IRQ_BEI
|
IRQ_EPI
|
IRQ_ALI
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录