diff --git a/[refs] b/[refs]
index fc527ee956b5..33c90db1b13b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 753e3aca735dc446f66d501b625122661738b57d
+refs/heads/master: e0fa3b43df0b57967857b2c83bad9a5193fbddf5
diff --git a/trunk/drivers/pci/pci-acpi.c b/trunk/drivers/pci/pci-acpi.c
index c580a525d9ce..736bb248008e 100644
--- a/trunk/drivers/pci/pci-acpi.c
+++ b/trunk/drivers/pci/pci-acpi.c
@@ -210,6 +210,10 @@ acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
 		goto out;
 	}
 
+	/* No need to evaluate _OSC if the control was already granted. */
+	if ((osc_data->control_set & ctrlset) == ctrlset)
+		goto out;
+
 	if (!osc_data->is_queried) {
 		status = __acpi_query_osc(osc_data->support_set, osc_data);
 		if (ACPI_FAILURE(status))