diff options
| author | Ziyann <jaraidaniel@gmail.com> | 2014-11-26 11:37:03 +0100 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-11-26 11:37:03 +0100 |
| commit | e90611725bc4dcc8946e74c38bb2c58fdf6bf98f (patch) | |
| tree | a6a2441a53406a47f3a4b4a5103c0a067aaab445 /drivers/acpi/pci_root.c | |
| parent | da82942bbd6a40cf7ddd3edc52352610905137ce (diff) | |
| parent | 5dba9ddd98cbc7ad319d687887981a0ea0062c75 (diff) | |
| download | kernel_samsung_tuna-e90611725bc4dcc8946e74c38bb2c58fdf6bf98f.zip kernel_samsung_tuna-e90611725bc4dcc8946e74c38bb2c58fdf6bf98f.tar.gz kernel_samsung_tuna-e90611725bc4dcc8946e74c38bb2c58fdf6bf98f.tar.bz2 | |
Merge remote-tracking branch 'linux/linux-3.0.y' into stable-newpvr
Conflicts:
arch/arm/include/asm/hardware/cache-l2x0.h
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index dfafecb..ea89d85 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -247,8 +247,8 @@ static acpi_status acpi_pci_query_osc(struct acpi_pci_root *root, *control &= OSC_PCI_CONTROL_MASKS; capbuf[OSC_CONTROL_TYPE] = *control | root->osc_control_set; } else { - /* Run _OSC query for all possible controls. */ - capbuf[OSC_CONTROL_TYPE] = OSC_PCI_CONTROL_MASKS; + /* Run _OSC query only with existing controls. */ + capbuf[OSC_CONTROL_TYPE] = root->osc_control_set; } status = acpi_pci_run_osc(root->device->handle, capbuf, &result); |