diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-30 08:06:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-30 08:06:14 -0700 |
| commit | 29c222d1a9f503de4d26d8de8e955be190526adf (patch) | |
| tree | b924723f1eeb43cfb2a080af56b4aaab26877036 /drivers/platform | |
| parent | ef92ab3001c4656d3b9a7c4a8044b5bc08f6f6ef (diff) | |
| parent | 17b57b1883c1285f3d0dc2266e8f79286a7bef38 (diff) | |
| download | linux-29c222d1a9f503de4d26d8de8e955be190526adf.tar.bz2 | |
Merge 4.19-rc6
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/alienware-wmi.c | 1 | ||||
| -rw-r--r-- | drivers/platform/x86/dell-smbios-wmi.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c index d975462a4c57..f10af5c383c5 100644 --- a/drivers/platform/x86/alienware-wmi.c +++ b/drivers/platform/x86/alienware-wmi.c @@ -536,6 +536,7 @@ static acpi_status alienware_wmax_command(struct wmax_basic_args *in_args, if (obj && obj->type == ACPI_TYPE_INTEGER) *out_data = (u32) obj->integer.value; } + kfree(output.pointer); return status; } diff --git a/drivers/platform/x86/dell-smbios-wmi.c b/drivers/platform/x86/dell-smbios-wmi.c index 88afe5651d24..cf2229ece9ff 100644 --- a/drivers/platform/x86/dell-smbios-wmi.c +++ b/drivers/platform/x86/dell-smbios-wmi.c @@ -78,6 +78,7 @@ static int run_smbios_call(struct wmi_device *wdev) dev_dbg(&wdev->dev, "result: [%08x,%08x,%08x,%08x]\n", priv->buf->std.output[0], priv->buf->std.output[1], priv->buf->std.output[2], priv->buf->std.output[3]); + kfree(output.pointer); return 0; } |