From 5b741035cff86df98463da7efe5e5b19e8a50695 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 3 Dec 2012 19:05:13 +0000
Subject: [PATCH] --- yaml --- r: 341876 b: refs/heads/master c:
 008d845cf65c3153bbcfa2f1cb3369a99e12de02 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/ethernet/neterion/s2io.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index deacf1668dd1..9b0a900bc9a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 812e44dd1829488096929ff362f749ae04dc71a0
+refs/heads/master: 008d845cf65c3153bbcfa2f1cb3369a99e12de02
diff --git a/trunk/drivers/net/ethernet/neterion/s2io.c b/trunk/drivers/net/ethernet/neterion/s2io.c
index 3a010e356661..7c94c089212f 100644
--- a/trunk/drivers/net/ethernet/neterion/s2io.c
+++ b/trunk/drivers/net/ethernet/neterion/s2io.c
@@ -1040,7 +1040,7 @@ static int s2io_verify_pci_mode(struct s2io_nic *nic)
 static int s2io_on_nec_bridge(struct pci_dev *s2io_pdev)
 {
 	struct pci_dev *tdev = NULL;
-	while ((tdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, tdev)) != NULL) {
+	for_each_pci_dev(tdev) {
 		if (tdev->vendor == NEC_VENID && tdev->device == NEC_DEVID) {
 			if (tdev->bus == s2io_pdev->bus->parent) {
 				pci_dev_put(tdev);