1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 0fb100ed91a3..12aa97f31f93 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -164,11 +164,6 @@ int hv_init(void)
 
         max_leaf = query_hypervisor_info();
 
-        rdmsrl(HV_X64_MSR_GUEST_OS_ID, hv_context.guestid);
-
-        if (hv_context.guestid != 0)
-                goto cleanup;
-
         /* Write our OS info */
         wrmsrl(HV_X64_MSR_GUEST_OS_ID, HV_LINUX_GUEST_ID);
         hv_context.guestid = HV_LINUX_GUEST_ID;
@@ -237,6 +232,9 @@ void hv_cleanup(void)
 {
         union hv_x64_msr_hypercall_contents hypercall_msr;
 
+        /* Reset our OS id */
+        wrmsrl(HV_X64_MSR_GUEST_OS_ID, 0);
+
         kfree(hv_context.signal_event_buffer);
         hv_context.signal_event_buffer = NULL;
         hv_context.signal_event_param = NULL;