platform/x86: dell-laptop: don't register micmute LED if there is no token
authorKoba Ko <koba.ko@canonical.com>
Mon, 11 May 2020 01:44:56 +0000 (09:44 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jun 2020 07:30:53 +0000 (09:30 +0200)
[ Upstream commit 257e03a334ccb96e657bf5f6ab3b5693a22c2aa4 ]

On Dell G3-3590, error message is issued during boot up,
"platform::micmute: Setting an LED's brightness failed (-19)",
but there's no micmute led on the machine.

Get the related tokens of SMBIOS, GLOBAL_MIC_MUTE_DISABLE/ENABLE.
If one of two tokens doesn't exist,
don't call led_classdev_register() for platform::micmute.
After that, you wouldn't see the platform::micmute in /sys/class/leds/,
and the error message wouldn't see in dmesg.

Fixes: d00fa46e0a2c6 ("platform/x86: dell-laptop: Add micmute LED trigger support")
Signed-off-by: Koba Ko <koba.ko@canonical.com>
Reviewed-by: Mario Limonciello <Mario.limonciello@dell.com>
Reviewed-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/platform/x86/dell-laptop.c

index 74e988f..4c1dd1d 100644 (file)
@@ -2204,10 +2204,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;