Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 87340
b: refs/heads/master
c: 8d039bc
h: refs/heads/master
v: v3
  • Loading branch information
Carlos Corbacho authored and Len Brown committed Mar 12, 2008
1 parent ab5a450 commit 31589ef
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 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: a527f2d7fe58ce95bfec998f3dc6f658c777a2f2
refs/heads/master: 8d039bc7f3d2330787eaa7a392f5e6489f1544d5
12 changes: 7 additions & 5 deletions trunk/drivers/misc/acer-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1052,19 +1052,21 @@ static int __init acer_wmi_init(void)

if (wmi_has_guid(WMID_GUID2) && interface) {
if (ACPI_FAILURE(WMID_set_capabilities())) {
printk(ACER_ERR "Unable to detect available devices\n");
printk(ACER_ERR "Unable to detect available WMID "
"devices\n");
return -ENODEV;
}
} else if (!wmi_has_guid(WMID_GUID2) && interface) {
printk(ACER_ERR "Unable to detect available devices\n");
printk(ACER_ERR "No WMID device detection method found\n");
return -ENODEV;
}

if (wmi_has_guid(AMW0_GUID1) && !wmi_has_guid(WMID_GUID1)) {
interface = &AMW0_interface;

if (ACPI_FAILURE(AMW0_set_capabilities())) {
printk(ACER_ERR "Unable to detect available devices\n");
printk(ACER_ERR "Unable to detect available AMW0 "
"devices\n");
return -ENODEV;
}
}
Expand All @@ -1075,8 +1077,8 @@ static int __init acer_wmi_init(void)
find_quirks();

if (!interface) {
printk(ACER_ERR "No or unsupported WMI interface, unable to ");
printk(KERN_CONT "load.\n");
printk(ACER_ERR "No or unsupported WMI interface, unable to "
"load\n");
return -ENODEV;
}

Expand Down

0 comments on commit 31589ef

Please sign in to comment.