Skip to content

L
linux
Commit 1b104678 authored by Russell King's avatar Russell King
Browse files
Options

[ARM] Fix two missed ether1_outw() function calls. 

Signed-off-by: default avatarRussell King <rmk@arm.linux.org.uk>
parent 8d511c7b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/net/arm/ether1.c
View file @ 1b104678
...@@ -770,7 +770,7 @@ ether1_xmit_done (struct net_device *dev) ...@@ -770,7 +770,7 @@ ether1_xmit_done (struct net_device *dev)
/* special case */ /* special case */
if (ether1_readw(dev, SCB_ADDR, scb_t, scb_cbl_offset, NORMALIRQS) if (ether1_readw(dev, SCB_ADDR, scb_t, scb_cbl_offset, NORMALIRQS)
!= (unsigned short)I82586_NULL) { != (unsigned short)I82586_NULL) {
ether1_outw(dev, SCB_CMDCUCSTART | SCB_CMDRXSTART, SCB_ADDR, scb_t, ether1_writew(dev, SCB_CMDCUCSTART | SCB_CMDRXSTART, SCB_ADDR, scb_t,
scb_command, NORMALIRQS); scb_command, NORMALIRQS);
writeb(CTRL_CA, REG_CONTROL); writeb(CTRL_CA, REG_CONTROL);
} }
...@@ -917,7 +917,7 @@ ether1_interrupt (int irq, void *dev_id, struct pt_regs *regs) ...@@ -917,7 +917,7 @@ ether1_interrupt (int irq, void *dev_id, struct pt_regs *regs)
status = ether1_readw(dev, SCB_ADDR, scb_t, scb_status, NORMALIRQS); status = ether1_readw(dev, SCB_ADDR, scb_t, scb_status, NORMALIRQS);
if (status) { if (status) {
ether1_outw(dev, status & (SCB_STRNR | SCB_STCNA | SCB_STFR | SCB_STCX), ether1_writew(dev, status & (SCB_STRNR | SCB_STCNA | SCB_STFR | SCB_STCX),
SCB_ADDR, scb_t, scb_command, NORMALIRQS); SCB_ADDR, scb_t, scb_command, NORMALIRQS);
writeb(CTRL_CA | CTRL_ACK, REG_CONTROL); writeb(CTRL_CA | CTRL_ACK, REG_CONTROL);
if (status & SCB_STCX) { if (status & SCB_STCX) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7