From patchwork Fri Dec 25 12:32:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sedat Dilek X-Patchwork-Id: 69744 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBPCWwoM018147 for ; Fri, 25 Dec 2009 12:32:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752418AbZLYMc5 (ORCPT ); Fri, 25 Dec 2009 07:32:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753966AbZLYMc5 (ORCPT ); Fri, 25 Dec 2009 07:32:57 -0500 Received: from ey-out-2122.google.com ([74.125.78.24]:43451 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752418AbZLYMc4 (ORCPT ); Fri, 25 Dec 2009 07:32:56 -0500 Received: by ey-out-2122.google.com with SMTP id 4so480727eyf.5 for ; Fri, 25 Dec 2009 04:32:54 -0800 (PST) MIME-Version: 1.0 Received: by 10.213.51.3 with SMTP id b3mr8404233ebg.31.1261744374763; Fri, 25 Dec 2009 04:32:54 -0800 (PST) In-Reply-To: <2d0a357f0912250315r1f3922e1ta731d03a313d69c6@mail.gmail.com> References: <2d0a357f0912241711o97011od6c1750d7acf8b9e@mail.gmail.com> <4B3413C4.6070602@gmail.com> <2d0a357f0912250048h2bc987ccs4d4d253a4155becf@mail.gmail.com> <2d0a357f0912250315r1f3922e1ta731d03a313d69c6@mail.gmail.com> Date: Fri, 25 Dec 2009 13:32:54 +0100 Message-ID: <2d0a357f0912250432l4c407696g5ff7c35d5721a2ae@mail.gmail.com> Subject: Re: [2.6.33-rc2] ACPI problems on HP nc6400 notebook From: Sedat Dilek To: LKML , linux-acpi@vger.kernel.org Cc: len.brown@intel.com, maciej.rutecki@gmail.com, w.landgraf@ru.ru, "Justin P. Mattock" Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From f2366a0b009de3fc7be9967e9e65a12b666b05c1 Mon Sep 17 00:00:00 2001 From: Sedat Dilek Date: Fri, 25 Dec 2009 09:54:31 +0100 Subject: [PATCH] Revert "wmi: Free the allocated acpi objects through wmi_get_event_data" This reverts commit 3e9b988e4edf065d39c1343937f717319b1c1065. --- drivers/platform/x86/dell-wmi.c | 1 - drivers/platform/x86/hp-wmi.c | 2 -- drivers/platform/x86/wmi.c | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 6561dfc..67f3fe7 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -238,7 +238,6 @@ static void dell_wmi_notify(u32 value, void *context) input_sync(dell_wmi_input_dev); } } - kfree(obj); } diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index db10c5d..63c3e65 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -381,8 +381,6 @@ static void hp_wmi_notify(u32 value, void *context) } else printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n", eventcode); - - kfree(obj); } static int __init hp_wmi_input_setup(void) diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 9f93d6c..e425a86 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -540,8 +540,8 @@ EXPORT_SYMBOL_GPL(wmi_remove_notify_handler); /** * wmi_get_event_data - Get WMI data associated with an event * - * @event: Event to find - * @out: Buffer to hold event data. out->pointer should be freed with kfree() + * @event - Event to find + * &out - Buffer to hold event data * * Returns extra data associated with an event in WMI. */ -- 1.6.5.7