diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:21:24 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:21:24 -0500 |
| commit | 972421264637b5df168125e157d881c1899519dd (patch) | |
| tree | 388eb131fccbb7440753896e1a2c764bec8d70ab /drivers | |
| parent | e52542443aa9be15439e9879baf6d41b290e94db (diff) | |
| parent | e53091fae52931a96dfb661f2b78e0a91e5f9978 (diff) | |
| download | op-kernel-dev-972421264637b5df168125e157d881c1899519dd.zip op-kernel-dev-972421264637b5df168125e157d881c1899519dd.tar.gz | |
Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/r8169.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 159b56a..14a76f7 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -1346,10 +1346,8 @@ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out, } else { if (netif_msg_probe(tp)) { printk(KERN_ERR PFX - "Cannot find PowerManagement capability. " - "Aborting.\n"); + "PowerManagement capability not found.\n"); } - goto err_out_mwi; } /* make sure PCI base addr 1 is MMIO */ @@ -2516,7 +2514,7 @@ rtl8169_interrupt(int irq, void *dev_instance, struct pt_regs *regs) } while (boguscnt > 0); if (boguscnt <= 0) { - if (net_ratelimit() && netif_msg_intr(tp)) { + if (netif_msg_intr(tp) && net_ratelimit() ) { printk(KERN_WARNING "%s: Too much work at interrupt!\n", dev->name); } |
