updating acpica patches to account for upstream fixes
This commit is contained in:
parent
3305709986
commit
9ee18c53f4
|
@ -166,58 +166,6 @@ index b6d58cc..5c00e5e 100644
|
||||||
status = acpi_bus_get_status_handle(device->handle, &sta);
|
status = acpi_bus_get_status_handle(device->handle, &sta);
|
||||||
if (ACPI_FAILURE(status))
|
if (ACPI_FAILURE(status))
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
|
|
||||||
index b0fe527..4c1b90e 100644
|
|
||||||
--- a/drivers/acpi/scan.c
|
|
||||||
+++ b/drivers/acpi/scan.c
|
|
||||||
@@ -1565,6 +1565,8 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
|
|
||||||
device_initialize(&device->dev);
|
|
||||||
dev_set_uevent_suppress(&device->dev, true);
|
|
||||||
acpi_init_coherency(device);
|
|
||||||
+ /* Assume there are unmet deps until acpi_device_dep_initialize runs */
|
|
||||||
+ device->dep_unmet = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void acpi_device_add_finalize(struct acpi_device *device)
|
|
||||||
@@ -1588,6 +1590,14 @@ static int acpi_add_single_object(struct acpi_device **child,
|
|
||||||
}
|
|
||||||
|
|
||||||
acpi_init_device_object(device, handle, type, sta);
|
|
||||||
+ /*
|
|
||||||
+ * For ACPI_BUS_TYPE_DEVICE getting the status is delayed till here so
|
|
||||||
+ * that we can call acpi_bus_get_status and use its quirk handling.
|
|
||||||
+ * Note this must be done before the get power-/wakeup_dev-flags calls.
|
|
||||||
+ */
|
|
||||||
+ if (type == ACPI_BUS_TYPE_DEVICE)
|
|
||||||
+ acpi_bus_get_status(device);
|
|
||||||
+
|
|
||||||
acpi_bus_get_power_flags(device);
|
|
||||||
acpi_bus_get_wakeup_device_flags(device);
|
|
||||||
|
|
||||||
@@ -1660,9 +1670,11 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
*type = ACPI_BUS_TYPE_DEVICE;
|
|
||||||
- status = acpi_bus_get_status_handle(handle, sta);
|
|
||||||
- if (ACPI_FAILURE(status))
|
|
||||||
- *sta = 0;
|
|
||||||
+ /*
|
|
||||||
+ * acpi_add_single_object updates this once we've an acpi_device
|
|
||||||
+ * so that acpi_bus_get_status' quirk handling can be used.
|
|
||||||
+ */
|
|
||||||
+ *sta = 0;
|
|
||||||
break;
|
|
||||||
case ACPI_TYPE_PROCESSOR:
|
|
||||||
*type = ACPI_BUS_TYPE_PROCESSOR;
|
|
||||||
@@ -1760,6 +1772,8 @@ static void acpi_device_dep_initialize(struct acpi_device *adev)
|
|
||||||
acpi_status status;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
+ adev->dep_unmet = 0;
|
|
||||||
+
|
|
||||||
if (!acpi_has_method(adev->handle, "_DEP"))
|
|
||||||
return;
|
|
||||||
|
|
||||||
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
|
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
|
||||||
index 984c7e8..8472c4a 100644
|
index 984c7e8..8472c4a 100644
|
||||||
--- a/drivers/pci/hotplug/acpiphp_ibm.c
|
--- a/drivers/pci/hotplug/acpiphp_ibm.c
|
||||||
|
|
Loading…
Reference in a new issue