From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 19 Oct 2005 01:31:02 +0000 (-0400)
Subject: [PATCH] sundance: expand reset mask
X-Git-Tag: v2.6.15-rc1~733^2~1^2~13
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2aa1d82db7a967b748c4b41854c4222cd0484114;p=linux-2.6

[PATCH] sundance: expand reset mask

Expand the mask used when reseting the chip to include the GlobalReset
bit.  This fix comes from ICPlus and seems to be required for some
cards.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 8c4eb11ab4..d8a7e08cab 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -691,7 +691,7 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
 	/* Reset the chip to erase previous misconfiguration. */
 	if (netif_msg_hw(np))
 		printk("ASIC Control is %x.\n", ioread32(ioaddr + ASICCtrl));
-	iowrite16(0x007f, ioaddr + ASICCtrl + 2);
+	iowrite16(0x00ff, ioaddr + ASICCtrl + 2);
 	if (netif_msg_hw(np))
 		printk("ASIC Control is now %x.\n", ioread32(ioaddr + ASICCtrl));