Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.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);
                 }