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

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

[gregkh]

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 <stable@vger.kernel.org>.

thanks,

greg k-h

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

From 6cc13c28da5beee0f706db6450e190709700b34a Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@dell.com>
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.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=201427
Reported-by: Pepijn de Vos <pepijndevos@gmail.com>
Fixes: 549b49 ("platform/x86: dell-smbios: Introduce dispatcher for SMM calls")
Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
Acked-by: Pali Rohár <pali.rohar@gmail.com>
Cc: <stable@vger.kernel.org> # 4.14.x
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>

diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 95e6ca116e00..a561f653cf13 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -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)))

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

[Greg KH]

On Mon, May 13, 2019 at 09:56:43AM +0200, pepijn de vos wrote:
> 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.
> 
> Regards,
> Pepijn de Vos
> 
> On Mon, May 13, 2019 at 9:41 AM <gregkh@linuxfoundation.org> 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 <stable@vger.kernel.org>.
> >
> > thanks,
> >
> > greg k-h
> >
> > ------------------ original commit in Linus's tree ------------------
> >
> > From 6cc13c28da5beee0f706db6450e190709700b34a Mon Sep 17 00:00:00 2001
> > From: Mario Limonciello <mario.limonciello@dell.com>
> > 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.
> >
> > BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=201427
> > Reported-by: Pepijn de Vos <pepijndevos@gmail.com>
> > Fixes: 549b49 ("platform/x86: dell-smbios: Introduce dispatcher for SMM
> > calls")
> > Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
> > Acked-by: Pali Rohár <pali.rohar@gmail.com>
> > Cc: <stable@vger.kernel.org> # 4.14.x

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?