From a28861e7d6f4e78c1d3b6e8b30fa4b00131b4702 Mon Sep 17 00:00:00 2001
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Sat, 3 Jul 2010 20:04:47 +0400
Subject: [PATCH] --- yaml --- r: 208005 b: refs/heads/master c:
 402e8dd697d9dbfc40645148d0f539a43b6fc3a6 h: refs/heads/master i:   208003:
 d07b945b3f2214ff8aa29f27d896243effbf2f9d v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/core/hcd-pci.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7c080ee09f1a..751a41527d20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e29709e2e577a862dbffe1c89f8033255a322bb
+refs/heads/master: 402e8dd697d9dbfc40645148d0f539a43b6fc3a6
diff --git a/trunk/drivers/usb/core/hcd-pci.c b/trunk/drivers/usb/core/hcd-pci.c
index fe6b8d40a506..c3f98543caaf 100644
--- a/trunk/drivers/usb/core/hcd-pci.c
+++ b/trunk/drivers/usb/core/hcd-pci.c
@@ -66,10 +66,7 @@ static void companion_common(struct pci_dev *pdev, struct usb_hcd *hcd,
 	 * vice versa.
 	 */
 	companion = NULL;
-	for (;;) {
-		companion = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, companion);
-		if (!companion)
-			break;
+	for_each_pci_dev(companion) {
 		if (companion->bus != pdev->bus ||
 				PCI_SLOT(companion->devfn) != slot)
 			continue;