diff --git a/[refs] b/[refs] index 7d5ce2eabd17..3ace84da31eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e70da5634835ecd8abb68d14cfc27384d01dd201 +refs/heads/master: 2d8348b429b4ae5cc47449c787881221fe43af4b diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c index 43749c86861f..3f7935ab0cf5 100644 --- a/trunk/drivers/acpi/ec.c +++ b/trunk/drivers/acpi/ec.c @@ -886,7 +886,8 @@ int __init acpi_ec_ecdt_probe(void) 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); - if (ACPI_FAILURE(status)) + /* Check that acpi_get_devices actually find something */ + if (ACPI_FAILURE(status) || !boot_ec->handle) goto error; }