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; } /*