projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7bf3f23
)
sis190: scheduling while atomic error
author
Francois Romieu
<romieu@fr.zoreil.com>
Sat, 17 Nov 2007 20:29:47 +0000
(21:29 +0100)
committer
David S. Miller
<davem@davemloft.net>
Wed, 23 Jan 2008 11:11:45 +0000
(
03:11
-0800)
sis190_tx_timeout
-> sis190_hw_start
-> sis190_soft_reset
-> msleep *splat*
PCI transactions are correctly flushed here.
The msleep() is probably useless.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: K.M. Liu <kmliu@sis.com.tw>
drivers/net/sis190.c
patch
|
blob
|
history
diff --git
a/drivers/net/sis190.c
b/drivers/net/sis190.c
index 342a986214c86cb5f09e2c1af374059bda0782fe..b570402f7feda2a06fc975a5aaf82e19b1f45432 100644
(file)
--- a/
drivers/net/sis190.c
+++ b/
drivers/net/sis190.c
@@
-847,10
+847,8
@@
static void sis190_soft_reset(void __iomem *ioaddr)
{
SIS_W32(IntrControl, 0x8000);
SIS_PCI_COMMIT();
- msleep(1);
SIS_W32(IntrControl, 0x0);
sis190_asic_down(ioaddr);
- msleep(1);
}
static void sis190_hw_start(struct net_device *dev)