diff options
| author | Len Brown <len.brown@intel.com> | 2010-06-01 22:53:36 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-06-01 22:53:36 -0400 |
| commit | b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732 (patch) | |
| tree | 194e13dfa85d2d2af8bd125acd80a445ee0def62 /drivers/acpi/ec.c | |
| parent | fe955682d2153b35dffcf1673dff0491096a3f0a (diff) | |
| parent | 0a76a34ff0804f1f413807b2e2d12117c2b602ca (diff) | |
| download | op-kernel-dev-b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732.zip op-kernel-dev-b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732.tar.gz | |
Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 3f01f06..5f2027d 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1037,10 +1037,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 */ } |
