diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 12:23:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 12:23:07 -0800 |
| commit | e67b23c71cb9ee02d65a74c3858716ba2dedd554 (patch) | |
| tree | 17cfeadd37b93ca758aa3ffb61e02edf62289aea /drivers/net/r8169.c | |
| parent | d4bf205305a9188894ac4e2e9875e42f9f8eabfd (diff) | |
| parent | f7492f17f2123f0f4db5f9e8ba89867a7b352658 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/r8169.c')
| -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 159b56a56ef4..14a76f7cf900 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); } |