2 files changed, 7 insertions, 16 deletions

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index d2ae816df0f5..77cd19697b1e 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -249,12 +249,8 @@ static acpi_status acpi_pci_query_osc(struct acpi_pci_root *root,
         status = acpi_pci_run_osc(root->device->handle, capbuf, &result);
         if (ACPI_SUCCESS(status)) {
                 root->osc_support_set = support;
-                if (control) {
+                if (control)
                         *control = result;
-                } else {
-                        root->osc_control_qry = result;
-                        root->osc_queried = 1;
-                }
         }
         return status;
 }
@@ -409,14 +405,12 @@ acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags)
                 goto out;
 
         /* Need to query controls first before requesting them */
-        if (!root->osc_queried) {
-                status = acpi_pci_query_osc(root, root->osc_support_set, NULL);
-                if (ACPI_FAILURE(status))
-                        goto out;
-        }
-        if ((root->osc_control_qry & control_req) != control_req) {
-                printk(KERN_DEBUG
-                       "Firmware did not grant requested _OSC control\n");
+        flags = control_req;
+        status = acpi_pci_query_osc(root, root->osc_support_set, &flags);
+        if (ACPI_FAILURE(status))
+                goto out;
+
+        if (flags != control_req) {
                 status = AE_SUPPORT;
                 goto out;
         }
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index baacd98e7cc6..4de84ce3a927 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -377,9 +377,6 @@ struct acpi_pci_root {
 
         u32 osc_support_set;    /* _OSC state of support bits */
         u32 osc_control_set;    /* _OSC state of control bits */
-        u32 osc_control_qry;    /* the latest _OSC query result */
-
-        u32 osc_queried:1;      /* has _OSC control been queried? */
 };
 
 /* helper */