From 5246741a3f2e0285394cf74f3105cb252b8f38ad Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@dell.com>
Date: Wed, 15 Nov 2017 14:21:13 -0600
Subject: [PATCH] platform/x86: dell-laptop: Allocate buffer before rfkill use
Git-commit: 5246741a3f2e0285394cf74f3105cb252b8f38ad
Patch-mainline: v4.15-rc1
References: FATE#325842
On machines using rfkill interface the buffer needs to have been
allocated before the initial use (memset) of it.
Reported-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
Tested-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/platform/x86/dell-laptop.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index c4903c5ce7cf..2d704361f672 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -2073,6 +2073,11 @@ static int __init dell_init(void)
if (ret)
goto fail_platform_device2;
+ buffer = kzalloc(sizeof(struct calling_interface_buffer), GFP_KERNEL);
+ if (!buffer)
+ goto fail_buffer;
+
+
ret = dell_setup_rfkill();
if (ret) {
@@ -2080,10 +2085,6 @@ static int __init dell_init(void)
goto fail_rfkill;
}
- buffer = kzalloc(sizeof(struct calling_interface_buffer), GFP_KERNEL);
- if (!buffer)
- goto fail_buffer;
-
if (quirks && quirks->touchpad_led)
touchpad_led_init(&platform_device->dev);
--
2.19.1