aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2007-11-17 21:29:47 +0100
committerDavid S. Miller <davem@davemloft.net>2008-01-23 03:11:45 -0800
commitb334349eb4c8562fd60bc8a8bd5ba6b42f22b8ac (patch)
treeb3a9fe0d264914c48aaa40d5eb07f16b58112bba /drivers/net
parent7bf3f232f7c78efee8c4d14ad9af8a5a40304916 (diff)
sis190: scheduling while atomic error
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/sis190.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 342a986214c..b570402f7fe 100644
--- 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)