summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorTero Roponen <tero.roponen@gmail.com>2009-01-17 13:06:02 +0200
committerLen Brown <len.brown@intel.com>2009-01-17 20:17:14 -0500
commit4312495f7db63d27ef52ec83dab55f14a8c43827 (patch)
tree688080db58bbf5478996227d989e707e51cc9c22 /drivers/acpi
parent1de9e8e70f5acc441550ca75433563d91b269bbe (diff)
downloadop-kernel-dev-4312495f7db63d27ef52ec83dab55f14a8c43827.zip
op-kernel-dev-4312495f7db63d27ef52ec83dab55f14a8c43827.tar.gz
ACPI: Fix crash on ASUS laptops
This patch fixes the crash I experienced in 2.6.29-rc2. Tested on ASUS M50vm. Signed-off-by: Tero Roponen <tero.roponen@gmail.com> Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/ec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index a2b82c9..5c2f5d3 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -982,7 +982,7 @@ int __init acpi_ec_ecdt_probe(void)
saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
if (!saved_ec)
return -ENOMEM;
- memcpy(&saved_ec, boot_ec, sizeof(saved_ec));
+ memcpy(saved_ec, boot_ec, sizeof(*saved_ec));
/* fall through */
}
/* This workaround is needed only on some broken machines,
OpenPOWER on IntegriCloud