diff options
| author | Tero Roponen <tero.roponen@gmail.com> | 2009-01-17 06:06:02 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-17 20:17:14 -0500 |
| commit | 4312495f7db63d27ef52ec83dab55f14a8c43827 (patch) | |
| tree | 688080db58bbf5478996227d989e707e51cc9c22 /drivers | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
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')
| -rw-r--r-- | drivers/acpi/ec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index a2b82c90a683..5c2f5d343be6 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
| @@ -982,7 +982,7 @@ int __init acpi_ec_ecdt_probe(void) | |||
| 982 | saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL); | 982 | saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL); |
| 983 | if (!saved_ec) | 983 | if (!saved_ec) |
| 984 | return -ENOMEM; | 984 | return -ENOMEM; |
| 985 | memcpy(&saved_ec, boot_ec, sizeof(saved_ec)); | 985 | memcpy(saved_ec, boot_ec, sizeof(*saved_ec)); |
| 986 | /* fall through */ | 986 | /* fall through */ |
| 987 | } | 987 | } |
| 988 | /* This workaround is needed only on some broken machines, | 988 | /* This workaround is needed only on some broken machines, |