|
@@ -1612,7 +1612,8 @@ static int acpi_add_single_object(struct acpi_device **child,
|
|
* Note this must be done before the get power-/wakeup_dev-flags calls.
|
|
* Note this must be done before the get power-/wakeup_dev-flags calls.
|
|
*/
|
|
*/
|
|
if (type == ACPI_BUS_TYPE_DEVICE)
|
|
if (type == ACPI_BUS_TYPE_DEVICE)
|
|
- acpi_bus_get_status(device);
|
|
|
|
|
|
+ if (acpi_bus_get_status(device) < 0)
|
|
|
|
+ acpi_set_device_status(device, 0);
|
|
|
|
|
|
acpi_bus_get_power_flags(device);
|
|
acpi_bus_get_power_flags(device);
|
|
acpi_bus_get_wakeup_device_flags(device);
|
|
acpi_bus_get_wakeup_device_flags(device);
|
|
@@ -1690,7 +1691,7 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
|
|
* acpi_add_single_object updates this once we've an acpi_device
|
|
* acpi_add_single_object updates this once we've an acpi_device
|
|
* so that acpi_bus_get_status' quirk handling can be used.
|
|
* so that acpi_bus_get_status' quirk handling can be used.
|
|
*/
|
|
*/
|
|
- *sta = 0;
|
|
|
|
|
|
+ *sta = ACPI_STA_DEFAULT;
|
|
break;
|
|
break;
|
|
case ACPI_TYPE_PROCESSOR:
|
|
case ACPI_TYPE_PROCESSOR:
|
|
*type = ACPI_BUS_TYPE_PROCESSOR;
|
|
*type = ACPI_BUS_TYPE_PROCESSOR;
|