aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/platform/x86/dell-laptop.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 7f59624d805d..b33b77991523 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -409,15 +409,14 @@ static int dell_rfkill_set(void *data, bool blocked)
409 dell_send_request(buffer, 17, 11); 409 dell_send_request(buffer, 17, 11);
410 410
411 /* If the hardware switch controls this radio, and the hardware 411 /* If the hardware switch controls this radio, and the hardware
412 switch is disabled, don't allow changing the software state */ 412 switch is disabled, always disable the radio */
413 if ((hwswitch_state & BIT(hwswitch_bit)) && 413 if ((hwswitch_state & BIT(hwswitch_bit)) &&
414 !(buffer->output[1] & BIT(16))) 414 !(buffer->output[1] & BIT(16)))
415 goto out; 415 disable = 1;
416 416
417 buffer->input[0] = (1 | (radio<<8) | (disable << 16)); 417 buffer->input[0] = (1 | (radio<<8) | (disable << 16));
418 dell_send_request(buffer, 17, 11); 418 dell_send_request(buffer, 17, 11);
419 419
420out:
421 release_buffer(); 420 release_buffer();
422 return 0; 421 return 0;
423} 422}