Skip to contentSkip to conversation

FAILED: patch "[PATCH] platform/x86: dell-laptop: fix rfkill functionality" failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 2 messages May 13, 2019 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 6cc13c28da5beee0f706db6450e190709700b34a Mon Sep 17 00:00:00 2001
From: Mario Limonciello <[email protected]>
Date: Wed, 27 Mar 2019 09:25:34 -0500
Subject: [PATCH] platform/x86: dell-laptop: fix rfkill functionality
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When converting the driver two arguments were transposed leading to rfkill not working.

Fixes 549b49 ("platform/x86: dell-smbios: Introduce dispatcher for SMM calls")
Cc <[email protected]> # 4.14.x
drivers/platform/x86/dell-laptop.c +3 -3
index 95e6ca116e00..a561f653cf13 100644
@@ -531,7 +531,7 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data)
 		return;
 	}
 
-	dell_fill_request(&buffer, 0, 0x2, 0, 0);
+	dell_fill_request(&buffer, 0x2, 0, 0, 0);
 	ret = dell_send_request(&buffer, CLASS_INFO, SELECT_RFKILL);
 	hwswitch = buffer.output[1];
 
@@ -562,7 +562,7 @@ static int dell_debugfs_show(struct seq_file *s, void *data)
 		return ret;
 	status = buffer.output[1];
 
-	dell_fill_request(&buffer, 0, 0x2, 0, 0);
+	dell_fill_request(&buffer, 0x2, 0, 0, 0);
 	hwswitch_ret = dell_send_request(&buffer, CLASS_INFO, SELECT_RFKILL);
 	if (hwswitch_ret)
 		return hwswitch_ret;
@@ -647,7 +647,7 @@ static void dell_update_rfkill(struct work_struct *ignored)
 	if (ret != 0)
 		return;
 
-	dell_fill_request(&buffer, 0, 0x2, 0, 0);
+	dell_fill_request(&buffer, 0x2, 0, 0, 0);
 	ret = dell_send_request(&buffer, CLASS_INFO, SELECT_RFKILL);
 
 	if (ret == 0 && (status & BIT(0)))

A message that is not in the archive (sent off-list or not yet received): CANPfQguhJSokwhFsfhCCyWzCvX6PPcT4mzXSCh3gC9nGc+_0Zg@mail.gmail.com

author maintainer
#2 lore raw
Quoted 5 lines · pepijn de vos

I attached a 4.15 patch to the bugzilla issue
https://bugzilla.kernel.org/show_bug.cgi?id=201427 which might also apply to earlier branches. Please let me know if any further action is needed to format this correctly for inclusion to the kernel.

Quoted 35 lines

Regards,
Pepijn de Vos

Quoted 30 lines · On Mon, May 13, 2019 at 9:41 AM <[email protected]> wrote:

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 6cc13c28da5beee0f706db6450e190709700b34a Mon Sep 17 00:00:00 2001
From: Mario Limonciello <[email protected]>
Date: Wed, 27 Mar 2019 09:25:34 -0500
Subject: [PATCH] platform/x86: dell-laptop: fix rfkill functionality
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When converting the driver two arguments were transposed leading to rfkill not working.

Fixes 549b49 ("platform/x86: dell-smbios: Introduce dispatcher for SMM

calls")

The problem is this says "4.14.x", yet 549b4930f057 ("platform/x86:
dell-smbios: Introduce dispatcher for SMM calls") was not in the tree until 4.15, so I don't see how this would work on 4.14.

Daren?