diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-27 07:41:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-27 07:41:11 -0800 |
| commit | 6d6585e490d985d421d7cd3cfc7d77b618c44130 (patch) | |
| tree | bf8c941eec540f0e30a37252be031c5504a24e16 /drivers | |
| parent | b9a33cebac70d6f67a769ce8d4078fee2b254ada (diff) | |
| parent | 7bef4b397874eee4484457040e8a1013361d7758 (diff) | |
| download | op-kernel-dev-6d6585e490d985d421d7cd3cfc7d77b618c44130.zip op-kernel-dev-6d6585e490d985d421d7cd3cfc7d77b618c44130.tar.gz | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sis900.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 3d95fa2..7a952fe 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c @@ -540,7 +540,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev, printk("%2.2x.\n", net_dev->dev_addr[i]); /* Detect Wake on Lan support */ - ret = inl(CFGPMC & PMESP); + ret = (inl(net_dev->base_addr + CFGPMC) & PMESP) >> 27; if (netif_msg_probe(sis_priv) && (ret & PME_D3C) == 0) printk(KERN_INFO "%s: Wake on LAN only available from suspend to RAM.", net_dev->name); @@ -2040,7 +2040,7 @@ static int sis900_set_wol(struct net_device *net_dev, struct ethtool_wolinfo *wo if (wol->wolopts == 0) { pci_read_config_dword(sis_priv->pci_dev, CFGPMCSR, &cfgpmcsr); - cfgpmcsr |= ~PME_EN; + cfgpmcsr &= ~PME_EN; pci_write_config_dword(sis_priv->pci_dev, CFGPMCSR, cfgpmcsr); outl(pmctrl_bits, pmctrl_addr); if (netif_msg_wol(sis_priv)) |
