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

Commit 4d39d88c authored by Hans de Goede's avatar Hans de Goede Committed by Matthew Garrett
Browse files

dell-laptop: Allow changing the sw_state while the radio is blocked by hw 



This makes dell-laptop's rfkill code consistent with other drivers which
allow sw_state changes while hw blocked.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMatthew Garrett <matthew.garrett@nebula.com>
parent 3f56588a

drivers/platform/x86/dell-laptop.c

+2 −5
Original line number Diff line number Diff line
@@ -404,7 +404,6 @@ static int dell_rfkill_set(void *data, bool blocked) 
	int disable = blocked ? 1 : 0;

	unsigned long radio = (unsigned long)data;

	int hwswitch_bit = (unsigned long)data - 1;

	int ret = 0;



	get_buffer();

	dell_send_request(buffer, 17, 11);
@@ -412,17 +411,15 @@ static int dell_rfkill_set(void *data, bool blocked) 
	/* If the hardware switch controls this radio, and the hardware

	   switch is disabled, don't allow changing the software state */

	if ((hwswitch_state & BIT(hwswitch_bit)) &&

	    !(buffer->output[1] & BIT(16))) {

		ret = -EINVAL;

	    !(buffer->output[1] & BIT(16)))

		goto out;

	}



	buffer->input[0] = (1 | (radio<<8) | (disable << 16));

	dell_send_request(buffer, 17, 11);



out:

	release_buffer();

	return ret;

	return 0;

}



static void dell_rfkill_update_sw_state(struct rfkill *rfkill, int radio,