From: Mario Limonciello <Mario_Limonciello@Dell.com>
Date: Tue, 9 Feb 2010 19:11:05 +0000 (-0500)
Subject: dell-laptop: Block software state changes when rfkill hard blocked
X-Git-Tag: v4.13~20014^2~7
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ec1722a21491e4c354bc3bbc704fef9a8fa811fb;p=mirror_ubuntu-bionic-kernel.git

dell-laptop: Block software state changes when rfkill hard blocked

The "hardware" switch is tied directly to a BIOS interface that will
connect and disconnect the hardware from the bus.

If you use the software interface to request the BIOS to make these
changes, the HW switch will be in an inconsistent state and LEDs may not
reflect the state of the HW.

Signed-off-by: Mario Limonciello <Mario_Limonciello@Dell.com>
---

diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index b13eb6a2cb51..81213e815400 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -190,6 +190,10 @@ static int dell_rfkill_set(void *data, bool blocked)
 	unsigned long radio = (unsigned long)data;
 
 	memset(&buffer, 0, sizeof(struct calling_interface_buffer));
+	dell_send_request(&buffer, 17, 11);
+	if (!(buffer.output[1] & BIT(16)))
+		return -EINVAL;
+
 	buffer.input[0] = (1 | (radio<<8) | (disable << 16));
 	dell_send_request(&buffer, 17, 11);