Attachment 181533 Details for Bug 334806

[patch] Enhanced patch with some sanity check to not break other machines

acpi_ec_fix_battery.patch (text/plain), 1.49 KB, created by Thomas Renninger on 2007-10-31 16:50:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Renninger

Created: 2007-10-31 16:50:56 UTC

Size: 1.49 KB

patch

obsolete

>---
> drivers/acpi/ec.c |   27 +++++++++++++++++----------
> 1 file changed, 17 insertions(+), 10 deletions(-)
>
>Index: linux-2.6.22-SL103_BRANCH/drivers/acpi/ec.c
>===================================================================
>--- linux-2.6.22-SL103_BRANCH.orig/drivers/acpi/ec.c
>+++ linux-2.6.22-SL103_BRANCH/drivers/acpi/ec.c
>@@ -823,18 +823,25 @@ int __init acpi_ec_ecdt_probe(void)
> 	/*
> 	 * Generate a boot ec context
> 	 */
>-
> 	status = acpi_get_table(ACPI_SIG_ECDT, 1,
> 				(struct acpi_table_header **)&ecdt_ptr);
>-	if (ACPI_FAILURE(status))
>-		goto error;
>-
>-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found ECDT"));
>-
>-	boot_ec->command_addr = ecdt_ptr->control.address;
>-	boot_ec->data_addr = ecdt_ptr->data.address;
>-	boot_ec->gpe = ecdt_ptr->gpe;
>-	boot_ec->handle = ACPI_ROOT_OBJECT;
>+	if (ACPI_SUCCESS(status)) {
>+		printk(KERN_INFO PREFIX "EC description table is found, configuring boot EC\n\n");
>+		boot_ec->command_addr = ecdt_ptr->control.address;
>+		boot_ec->data_addr = ecdt_ptr->data.address;
>+		boot_ec->gpe = ecdt_ptr->gpe;
>+		boot_ec->handle = ACPI_ROOT_OBJECT;
>+	} else {
>+		acpi_handle *x;
>+		printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
>+		status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
>+						boot_ec, NULL);
>+ 		/* Check that acpi_get_devices actually find something */
>+ 		if (ACPI_FAILURE(status) || !boot_ec->handle)
>+ 			goto error;
>+		if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", x)))
>+			goto error;
>+	}
> 
> 	ret = ec_install_handlers(boot_ec);
> 	if (!ret) {

Actions: View | Diff

Attachments on bug 334806: 179209 | 181533 | 181724 | 181728 | 181736