From 1348ad5412b6401a38c3b95b8a853ecef37e81bf Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Thu, 25 Aug 2011 09:48:39 -0700
Subject: [PATCH] --- yaml --- r: 267927 b: refs/heads/master c:
 5841a829594983077f670192b78fee4f7712e2b4 h: refs/heads/master i:   267925:
 46d94d176ad70c5d194d842ed9f1872bbf2b63ec   267923:
 a797fb5e4787cc3af92263164b6d96b526e33370   267919:
 14eb77800dfa85b831789734acc7fab7f27dc649 v: v3

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

diff --git a/[refs] b/[refs]
index aa0cf831fa19..f7b667bd2e27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ddda6603a6eea0b3aff294648ecb30a22e974f1
+refs/heads/master: 5841a829594983077f670192b78fee4f7712e2b4
diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
index afb16704221c..82769a411974 100644
--- a/trunk/drivers/staging/hv/vmbus_drv.c
+++ b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -255,21 +255,31 @@ static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env)
 	return ret;
 }
 
+static uuid_le null_guid;
+
+static inline bool is_null_guid(const __u8 *guid)
+{
+	if (memcmp(guid, &null_guid, sizeof(uuid_le)))
+		return false;
+	return true;
+}
+
 
 /*
  * vmbus_match - Attempt to match the specified device to the specified driver
  */
 static int vmbus_match(struct device *device, struct device_driver *driver)
 {
-	int match = 0;
 	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;
 
-	/* We found our driver ? */
-	if (!uuid_le_cmp(hv_dev->dev_type, drv->dev_type))
-		match = 1;
+	for (; !is_null_guid(id_array->guid); id_array++)
+		if (!memcmp(&id_array->guid, &hv_dev->dev_type.b,
+				sizeof(struct hv_vmbus_device_id)))
+			return 1;
 
-	return match;
+	return 0;
 }
 
 /*