diff options
| author | Thomas Renninger <trenn@suse.de> | 2009-12-18 15:29:23 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-24 00:54:49 -0500 |
| commit | 44ef00e6482e755f36629773abc2aee83a6f53e3 (patch) | |
| tree | 6552ee01bf2c1aa9c461df7cc1823a94899610ba /drivers/platform/x86/hp-wmi.c | |
| parent | 4d5f177caf1ef78f5e7eaee75b66b4d534445682 (diff) | |
| download | blackbird-op-linux-44ef00e6482e755f36629773abc2aee83a6f53e3.tar.gz blackbird-op-linux-44ef00e6482e755f36629773abc2aee83a6f53e3.zip | |
hp-wmi: Fix two memleaks
Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/x86/hp-wmi.c')
| -rw-r--r-- | drivers/platform/x86/hp-wmi.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index db10c5d007ec..8781d8fa7a57 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -134,10 +134,15 @@ static int hp_wmi_perform_query(int query, int write, int value) obj = output.pointer; - if (!obj || obj->type != ACPI_TYPE_BUFFER) + if (!obj) return -EINVAL; + else if (obj->type != ACPI_TYPE_BUFFER) { + kfree(obj); + return -EINVAL; + } bios_return = *((struct bios_return *)obj->buffer.pointer); + kfree(obj); if (bios_return.return_code > 0) return bios_return.return_code * -1; else @@ -340,10 +345,12 @@ static void hp_wmi_notify(u32 value, void *context) if (!obj || obj->type != ACPI_TYPE_BUFFER || obj->buffer.length != 8) { printk(KERN_INFO "HP WMI: Unknown response received\n"); + kfree(obj); return; } eventcode = *((u8 *) obj->buffer.pointer); + kfree(obj); if (eventcode == 0x4) eventcode = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0, 0); |
