sis190: scheduling while atomic error

b334349e · Francois Romieu <[email protected]> · 2007-11-17 21:29:47 +01:00

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 <[email protected]>
Cc: K.M. Liu <[email protected]>

Commit: b334349eb4c8562fd60bc8a8bd5ba6b42f22b8ac
Parents: 7bf3f232

Changes

1 files changed · +0 −2

File	Status	Add	Del	Content
drivers/net/sis190.c	modified	+0	−2	View file

drivers/net/sis190.c

View file

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 342a986..b570402 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)