From f13247e20f572c0bdcfee91e3e5ecb9b04c05cf0 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Thu, 25 Aug 2011 09:48:51 -0700
Subject: [PATCH] --- yaml --- r: 267937 b: refs/heads/master c:
 5433e00334d3e20f8bff70845c7f44e00cdf2d14 h: refs/heads/master i:   267935:
 a5a59931068c1548ea9a67e25c479a329ef422ef v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/staging/hv/hv.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8bfa1ee38226..e74eb0075ff0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffca7c40b62b182d9de17c7229346f4230df46d6
+refs/heads/master: 5433e00334d3e20f8bff70845c7f44e00cdf2d14
diff --git a/trunk/drivers/staging/hv/hv.c b/trunk/drivers/staging/hv/hv.c
index d2b921bd7652..736794ef7872 100644
--- a/trunk/drivers/staging/hv/hv.c
+++ b/trunk/drivers/staging/hv/hv.c
@@ -151,7 +151,6 @@ static u64 do_hypercall(u64 control, void *input, void *output)
  */
 int hv_init(void)
 {
-	int ret = 0;
 	int max_leaf;
 	union hv_x64_msr_hypercall_contents hypercall_msr;
 	void *virtaddr = NULL;
@@ -214,7 +213,7 @@ int hv_init(void)
 	hv_context.signal_event_param->flag_number = 0;
 	hv_context.signal_event_param->rsvdz = 0;
 
-	return ret;
+	return 0;
 
 cleanup:
 	if (virtaddr) {
@@ -225,8 +224,8 @@ int hv_init(void)
 
 		vfree(virtaddr);
 	}
-	ret = -1;
-	return ret;
+
+	return -ENOTSUPP;
 }
 
 /*