X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Facpi%2Fpower.c;h=76bf6d90c700efac7905d6167680915ca50e1498;hb=4f02f8220562591322c118d07a32bebf705318b7;hp=af1769a20c7a6ba3f0ee665b204a79c0a1f0c74c;hpb=71527bf8332ced9a961827272fe2f83fc5514f42;p=linux-2.6-omap-h63xx.git diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index af1769a20c7..76bf6d90c70 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -458,11 +458,9 @@ int acpi_power_transition(struct acpi_device *device, int state) } end: - if (result) { + if (result) device->power.state = ACPI_STATE_UNKNOWN; - printk(KERN_WARNING PREFIX "Transitioning device [%s] to D%d\n", - device->pnp.bus_id, state); - } else { + else { /* We shouldn't change the state till all above operations succeed */ device->power.state = state; }