Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 117203
b: refs/heads/master
c: ab20440
h: refs/heads/master
i:
  117201: 913ffc4
  117199: ba1905e
v: v3
  • Loading branch information
Taku Izumi authored and Jesse Barnes committed Oct 22, 2008
1 parent a0a0d02 commit daef066
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: adf411b819adc9fa96e9b3e638c7480d5e71d270
refs/heads/master: ab20440c376ff0454cb93904a888212d874fbb6b
7 changes: 3 additions & 4 deletions trunk/drivers/pci/pci-acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -149,20 +149,19 @@ static acpi_status acpi_query_osc(acpi_handle handle,

status = acpi_get_handle(handle, "_OSC", &tmp);
if (ACPI_FAILURE(status))
return status;
return AE_OK;

mutex_lock(&pci_acpi_lock);
osc_data = acpi_get_osc_data(handle);
if (!osc_data) {
printk(KERN_ERR "acpi osc data array is full\n");
status = AE_ERROR;
goto out;
}

status = __acpi_query_osc(flags, osc_data, &dummy);
__acpi_query_osc(flags, osc_data, &dummy);
out:
mutex_unlock(&pci_acpi_lock);
return status;
return AE_OK;
}

/**
Expand Down

0 comments on commit daef066

Please sign in to comment.