luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pnpacpi' into release

Browse Source
This commit is contained in:
Len Brown 2009-04-05 01:51:38 -04:00
commit 47ae106d3f
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/pnp/pnpacpi/core.c
View File

@ -83,7 +83,6 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
acpi_handle handle = dev->data; acpi_handle handle = dev->data;
struct acpi_buffer buffer; struct acpi_buffer buffer;
int ret; int ret;
acpi_status status;
pnp_dbg(&dev->dev, "set resources\n"); pnp_dbg(&dev->dev, "set resources\n");
ret = pnpacpi_build_resource_template(dev, &buffer); ret = pnpacpi_build_resource_template(dev, &buffer);
@ -94,21 +93,31 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
kfree(buffer.pointer); kfree(buffer.pointer);
return ret; return ret;
} }
status = acpi_set_current_resources(handle, &buffer); if (ACPI_FAILURE(acpi_set_current_resources(handle, &buffer)))
if (ACPI_FAILURE(status))
ret = -EINVAL; ret = -EINVAL;
else if (acpi_bus_power_manageable(handle))
ret = acpi_bus_set_power(handle, ACPI_STATE_D0);
kfree(buffer.pointer); kfree(buffer.pointer);
return ret; return ret;
} }
static int pnpacpi_disable_resources(struct pnp_dev *dev) static int pnpacpi_disable_resources(struct pnp_dev *dev)
{ {
acpi_status status; acpi_handle handle = dev->data;
int ret;
dev_dbg(&dev->dev, "disable resources\n");
/* acpi_unregister_gsi(pnp_irq(dev, 0)); */ /* acpi_unregister_gsi(pnp_irq(dev, 0)); */
status = acpi_evaluate_object((acpi_handle) dev->data, ret = 0;
"_DIS", NULL, NULL); if (acpi_bus_power_manageable(handle)) {
return ACPI_FAILURE(status) ? -ENODEV : 0; ret = acpi_bus_set_power(handle, ACPI_STATE_D3);
if (ret)
return ret;
}
if (ACPI_FAILURE(acpi_evaluate_object(handle, "_DIS", NULL, NULL)))
ret = -ENODEV;
return ret;
} }
#ifdef CONFIG_ACPI_SLEEP #ifdef CONFIG_ACPI_SLEEP