Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87cc345a authored by Mario Limonciello's avatar Mario Limonciello Committed by Greg Kroah-Hartman
Browse files

platform/x86: dell-laptop: fix rfkill functionality 

commit 6cc13c28da5beee0f706db6450e190709700b34a upstream.

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: default avatarPepijn de Vos <pepijndevos@gmail.com>
Fixes: 549b49 ("platform/x86: dell-smbios: Introduce dispatcher for SMM calls")
Signed-off-by: default avatarMario Limonciello <mario.limonciello@dell.com>
Acked-by: default avatarPali Rohár <pali.rohar@gmail.com>
Cc: <stable@vger.kernel.org> # 4.14.x
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 381eaca5

drivers/platform/x86/dell-laptop.c

+3 −3
Original line number Diff line number Diff line
@@ -532,7 +532,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];
@@ -563,7 +563,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;
@@ -648,7 +648,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)))