Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267937
b: refs/heads/master
c: 5433e00
h: refs/heads/master
i:
  267935: a5a5993
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Aug 25, 2011
1 parent a5f832e commit f13247e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ffca7c40b62b182d9de17c7229346f4230df46d6
refs/heads/master: 5433e00334d3e20f8bff70845c7f44e00cdf2d14
7 changes: 3 additions & 4 deletions trunk/drivers/staging/hv/hv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -225,8 +224,8 @@ int hv_init(void)

vfree(virtaddr);
}
ret = -1;
return ret;

return -ENOTSUPP;
}

/*
Expand Down

0 comments on commit f13247e

Please sign in to comment.