]> err.no Git - linux-2.6/commitdiff
[PATCH] sundance: expand reset mask
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Oct 2005 01:31:02 +0000 (21:31 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 19 Oct 2005 02:29:14 +0000 (22:29 -0400)
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>
drivers/net/sundance.c

index 8c4eb11ab44e789d0cbd8d8a776dd93f4bf47af3..d8a7e08cab2b4677e67317efdceb16281526b7f7 100644 (file)
@@ -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));