From 771d37eb5c8645d204e0cebfbfbfa0ea710a5811 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Sat, 15 May 2010 23:16:21 +0200 Subject: [PATCH] --- yaml --- r: 199261 b: refs/heads/master c: d6bd535d88429b4804d6d917ab4f586306f9a855 h: refs/heads/master i: 199259: e2962efcab43f6b15261ecc504dee07483cbe903 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/ec.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 35036071c02c..671e0231ce3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aeb834d95e771499cb0492d127aec3246d1595c8 +refs/heads/master: d6bd535d88429b4804d6d917ab4f586306f9a855 diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c index f2234db85da0..e61d4f8e62a5 100644 --- a/trunk/drivers/acpi/ec.c +++ b/trunk/drivers/acpi/ec.c @@ -1027,10 +1027,9 @@ int __init acpi_ec_ecdt_probe(void) /* Don't trust ECDT, which comes from ASUSTek */ if (!EC_FLAGS_VALIDATE_ECDT) goto install; - saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL); + saved_ec = kmemdup(boot_ec, sizeof(struct acpi_ec), GFP_KERNEL); if (!saved_ec) return -ENOMEM; - memcpy(saved_ec, boot_ec, sizeof(struct acpi_ec)); /* fall through */ }