diff --git a/[refs] b/[refs] index b23fff772f67..f91a113560a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bf3f232f7c78efee8c4d14ad9af8a5a40304916 +refs/heads/master: b334349eb4c8562fd60bc8a8bd5ba6b42f22b8ac diff --git a/trunk/drivers/net/sis190.c b/trunk/drivers/net/sis190.c index 342a986214c8..b570402f7fed 100644 --- a/trunk/drivers/net/sis190.c +++ b/trunk/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)