Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 102228
b: refs/heads/master
c: 681f7d9
h: refs/heads/master
v: v3
  • Loading branch information
Kenji Kaneshige authored and Jesse Barnes committed Jun 10, 2008
1 parent f98e332 commit 950bbd3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 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: 5e0b9947452c824d66fafe728a46312cff544a7f
refs/heads/master: 681f7d9db58d2b6dc3c3b784d6815f86a53b6ba0
4 changes: 3 additions & 1 deletion trunk/drivers/pci/pci-acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ struct acpi_osc_data {
acpi_handle handle;
u32 support_set;
u32 control_set;
int is_queried;
u32 query_result;
struct list_head sibiling;
};
Expand Down Expand Up @@ -147,6 +148,7 @@ static acpi_status acpi_query_osc(acpi_handle handle,
if (ACPI_SUCCESS(status)) {
osc_data->support_set = support_set;
osc_data->query_result = osc_args.query_result;
osc_data->is_queried = 1;
}

return status;
Expand Down Expand Up @@ -203,7 +205,7 @@ acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
if (!ctrlset)
return AE_TYPE;

if (osc_data->support_set &&
if (osc_data->is_queried &&
((osc_data->query_result & ctrlset) != ctrlset))
return AE_SUPPORT;

Expand Down

0 comments on commit 950bbd3

Please sign in to comment.