View | Details | Raw Unified | Return to bug 209989 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/acpi/ec.c (-14 lines)
Lines 1604-1623 static int acpi_ec_add(struct acpi_device *device) Link Here
1604
			ret = -EINVAL;
1604
			ret = -EINVAL;
1605
			goto err;
1605
			goto err;
1606
		}
1606
		}
1607
1608
		if (boot_ec && ec->command_addr == boot_ec->command_addr &&
1609
		    ec->data_addr == boot_ec->data_addr) {
1610
			/*
1611
			 * Trust PNP0C09 namespace location rather than
1612
			 * ECDT ID. But trust ECDT GPE rather than _GPE
1613
			 * because of ASUS quirks, so do not change
1614
			 * boot_ec->gpe to ec->gpe.
1615
			 */
1616
			boot_ec->handle = ec->handle;
1617
			acpi_handle_debug(ec->handle, "duplicated.\n");
1618
			acpi_ec_free(ec);
1619
			ec = boot_ec;
1620
		}
1621
	}
1607
	}
1622
1608
1623
	ret = acpi_ec_setup(ec, device);
1609
	ret = acpi_ec_setup(ec, device);

Return to bug 209989