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>

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 342a986..b570402 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();
 {
        SIS_W32(IntrControl, 0x8000);
        SIS_PCI_COMMIT();

-       msleep(1);

        SIS_W32(IntrControl, 0x0);
        sis190_asic_down(ioaddr);
        SIS_W32(IntrControl, 0x0);
        sis190_asic_down(ioaddr);

-       msleep(1);

 }
 
 static void sis190_hw_start(struct net_device *dev)
 }
 
 static void sis190_hw_start(struct net_device *dev)