From: Francois Romieu <romieu@electric-eye.fr.zoreil.com>
Date: Wed, 16 Nov 2005 22:44:41 +0000 (+0100)
Subject: r8169: do not abort when the power management capabilities are disabled
X-Git-Tag: v2.6.15-rc2~18^2~11^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e53091fae52931a96dfb661f2b78e0a91e5f9978;p=linux-2.6-omap-h63xx.git

r8169: do not abort when the power management capabilities are disabled

The capabilities of the 8169 can be disabled but it is hardly a reason
to prevent the use the device. The (so far) unusual behavior has been
reported on a MIPS platform by Yoichi Yuasa.

Spotted-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index bda6095f312..14a76f7cf90 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 */