From ab96d62ab7619919d0a8d5e15ee9ccf3010ac2e7 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Mon, 7 Mar 2011 13:34:48 -0800
Subject: [PATCH] --- yaml --- r: 236324 b: refs/heads/master c:
 70b0af4f52b3da6aeac2bd03221217beff4746a1 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/hv/vmbus.h     | 1 -
 trunk/drivers/staging/hv/vmbus_api.h | 2 ++
 trunk/drivers/staging/hv/vmbus_drv.c | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7f8f199c7668..d5a3c741ad3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3c7fe9a333516a14b34cf57684e864ecd2145ce
+refs/heads/master: 70b0af4f52b3da6aeac2bd03221217beff4746a1
diff --git a/trunk/drivers/staging/hv/vmbus.h b/trunk/drivers/staging/hv/vmbus.h
index a12e9e58d32f..ecd2d2fb47b1 100644
--- a/trunk/drivers/staging/hv/vmbus.h
+++ b/trunk/drivers/staging/hv/vmbus.h
@@ -32,7 +32,6 @@
 struct vm_device {
 	struct hv_guid class_id;
 	struct hv_guid device_id;
-	int probe_error;
 	struct hv_device device_obj;
 	struct device device;
 };
diff --git a/trunk/drivers/staging/hv/vmbus_api.h b/trunk/drivers/staging/hv/vmbus_api.h
index 60e40004e28f..4c5a38e349b6 100644
--- a/trunk/drivers/staging/hv/vmbus_api.h
+++ b/trunk/drivers/staging/hv/vmbus_api.h
@@ -120,6 +120,8 @@ struct hv_device {
 
 	struct work_struct probe_failed_work_item;
 
+	int probe_error;
+
 	/* the device type id of this device */
 	struct hv_guid dev_type;
 
diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
index 36c4ec8c2f83..0fcf377a24d4 100644
--- a/trunk/drivers/staging/hv/vmbus_drv.c
+++ b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -742,7 +742,7 @@ int vmbus_child_device_register(struct hv_device *root_device_obj,
 	ret = device_register(&child_device_ctx->device);
 
 	/* vmbus_probe() error does not get propergate to device_register(). */
-	ret = child_device_ctx->probe_error;
+	ret = child_device_ctx->device_obj.probe_error;
 
 	if (ret)
 		DPRINT_ERR(VMBUS_DRV, "unable to register child device (%p)",
@@ -908,7 +908,7 @@ static int vmbus_probe(struct device *child_device)
 
 	/* Let the specific open-source driver handles the probe if it can */
 	if (drv->driver.probe) {
-		ret = device_ctx->probe_error =
+		ret = device_ctx->device_obj.probe_error =
 		drv->driver.probe(child_device);
 		if (ret != 0) {
 			DPRINT_ERR(VMBUS_DRV, "probe() failed for device %s "