Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202469
b: refs/heads/master
c: d47bb5b
h: refs/heads/master
i:
  202467: ba7b186
v: v3
  • Loading branch information
Axel Lin authored and Matthew Garrett committed Aug 3, 2010
1 parent 77f1e6a commit 86892a6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: 80183a4b637982d56965e4a27b823c9a29d185b3
refs/heads/master: d47bb5b227f103f9bc0e572f478ac6b2a08fc2b2
5 changes: 3 additions & 2 deletions trunk/drivers/platform/x86/asus_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1340,7 +1340,8 @@ static int asus_hotk_get_info(void)
return -ENODEV;
}
hotk->methods = &model_conf[hotk->model];
return AE_OK;
kfree(model);
return 0;
}
hotk->methods = &model_conf[hotk->model];
printk(KERN_NOTICE " %s model detected, supported\n", string);
Expand Down Expand Up @@ -1374,7 +1375,7 @@ static int asus_hotk_get_info(void)

kfree(model);

return AE_OK;
return 0;
}

static int asus_hotk_check(void)
Expand Down

0 comments on commit 86892a6

Please sign in to comment.