2020-05-07 08:53:37

by Koba Ko

Subject: [PATCH] platform/x86: dell-laptop: don't register platform::micmute if the related tokens don't exist.

From: Koba Ko <[email protected]>

First, get the related tokens of SMBIOS, GLOBAL_MIC_MUTE_DISABLE/ENABLE.
If one of two tokens doesn't exist, don't register platform::micmute.

Signed-off-by: Koba Ko <[email protected]>
---
drivers/platform/x86/dell-laptop.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index 1e46022fb2c5..afc1ded83e56 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -2208,10 +2208,13 @@ static int __init dell_init(void)

dell_laptop_register_notifier(&dell_laptop_notifier);

- micmute_led_cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
- ret = led_classdev_register(&platform_device->dev, &micmute_led_cdev);
- if (ret < 0)
- goto fail_led;
+ if (dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE) &&
+ dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE)) {
+ micmute_led_cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE);
+ ret = led_classdev_register(&platform_device->dev, &micmute_led_cdev);
+ if (ret < 0)
+ goto fail_led;
+ }

if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
return 0;
--
2.17.1

2020-05-07 09:04:38

by Andy Shevchenko

Subject: Re: [PATCH] platform/x86: dell-laptop: don't register platform::micmute if the related tokens don't exist.

On Thu, May 7, 2020 at 11:49 AM <[email protected]> wrote:
>
> From: Koba Ko <[email protected]>
>
> First, get the related tokens of SMBIOS, GLOBAL_MIC_MUTE_DISABLE/ENABLE.
> If one of two tokens doesn't exist, don't register platform::micmute.

This doesn't explain why.

--
With Best Regards,
Andy Shevchenko