From 898f0852b97e3927ce764dbca5535fba344dddb8 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Tue, 13 Sep 2011 10:59:37 -0700
Subject: [PATCH] --- yaml --- r: 268367 b: refs/heads/master c:
 3037a7b61fa63160f2bd76555aa9ae59c6f71faf h: refs/heads/master i:   268365:
 fa026d44417f19e994219c0edc5b537d768f95d3   268363:
 11e24f8ef100ac4bb2554c5e1a0d54011247db0a   268359:
 f011b73a1630aa6e9337f0aa3942990db6c9102f   268351:
 8f580e11405a05d5bd6544ea76b2eddaa65666d3 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/staging/hv/vmbus_drv.c | 23 ++++++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ef0afefaa6b4..32e8007bdcec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25bb6c0a94ddd9eb486e41db87466615fad18036
+refs/heads/master: 3037a7b61fa63160f2bd76555aa9ae59c6f71faf
diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
index 375e45184d2b..77f4373ab893 100644
--- a/trunk/drivers/staging/hv/vmbus_drv.c
+++ b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -272,6 +272,22 @@ static inline bool is_null_guid(const __u8 *guid)
 	return true;
 }
 
+/*
+ * Return a matching hv_vmbus_device_id pointer.
+ * If there is no match, return NULL.
+ */
+static const struct hv_vmbus_device_id *hv_vmbus_get_id(
+					const struct hv_vmbus_device_id *id,
+					__u8 *guid)
+{
+	for (; !is_null_guid(id->guid); id++)
+		if (!memcmp(&id->guid, guid, sizeof(uuid_le)))
+			return id;
+
+	return NULL;
+}
+
+
 
 /*
  * vmbus_match - Attempt to match the specified device to the specified driver
@@ -280,12 +296,9 @@ static int vmbus_match(struct device *device, struct device_driver *driver)
 {
 	struct hv_driver *drv = drv_to_hv_drv(driver);
 	struct hv_device *hv_dev = device_to_hv_device(device);
-	const struct hv_vmbus_device_id *id_array = drv->id_table;
 
-	for (; !is_null_guid(id_array->guid); id_array++)
-		if (!memcmp(&id_array->guid, &hv_dev->dev_type.b,
-				sizeof(uuid_le)))
-			return 1;
+	if (hv_vmbus_get_id(drv->id_table, hv_dev->dev_type.b))
+		return 1;
 
 	return 0;
 }