From: Francois Romieu <romieu@fr.zoreil.com>
Date: Sat, 17 Nov 2007 20:29:47 +0000 (+0100)
Subject: sis190: scheduling while atomic error
X-Git-Tag: v2.6.24~10^2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b334349eb4c8562fd60bc8a8bd5ba6b42f22b8ac;p=linux-2.6-omap-h63xx.git

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 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)