Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 (97242126) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/r8169.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}