aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2005-10-18 21:31:02 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-18 22:29:14 -0400
commit2aa1d82db7a967b748c4b41854c4222cd0484114 (patch)
tree1f33849dad8fff3a9d287350126794f1cbfa0ef0 /drivers/net
parent67ec2f805a5260c041b1c3c7a86ecfbc9670db06 (diff)
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/sundance.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 8c4eb11ab44e..d8a7e08cab2b 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -691,7 +691,7 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
691 /* Reset the chip to erase previous misconfiguration. */ 691 /* Reset the chip to erase previous misconfiguration. */
692 if (netif_msg_hw(np)) 692 if (netif_msg_hw(np))
693 printk("ASIC Control is %x.\n", ioread32(ioaddr + ASICCtrl)); 693 printk("ASIC Control is %x.\n", ioread32(ioaddr + ASICCtrl));
694 iowrite16(0x007f, ioaddr + ASICCtrl + 2); 694 iowrite16(0x00ff, ioaddr + ASICCtrl + 2);
695 if (netif_msg_hw(np)) 695 if (netif_msg_hw(np))
696 printk("ASIC Control is now %x.\n", ioread32(ioaddr + ASICCtrl)); 696 printk("ASIC Control is now %x.\n", ioread32(ioaddr + ASICCtrl));
697 697