1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 359c87b3b1b2..03ca6c139f1a 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -5296,6 +5296,16 @@ static int __init led_init(struct ibm_init_struct *iibm)
 
         led_supported = led_init_detect_mode();
 
+        if (led_supported != TPACPI_LED_NONE) {
+                useful_leds = tpacpi_check_quirks(led_useful_qtable,
+                                ARRAY_SIZE(led_useful_qtable));
+
+                if (!useful_leds) {
+                        led_handle = NULL;
+                        led_supported = TPACPI_LED_NONE;
+                }
+        }
+
         vdbg_printk(TPACPI_DBG_INIT, "LED commands are %s, mode %d\n",
                 str_supported(led_supported), led_supported);
 
@@ -5309,9 +5319,6 @@ static int __init led_init(struct ibm_init_struct *iibm)
                 return -ENOMEM;
         }
 
-        useful_leds = tpacpi_check_quirks(led_useful_qtable,
-                                          ARRAY_SIZE(led_useful_qtable));
-
         for (i = 0; i < TPACPI_LED_NUMLEDS; i++) {
                 tpacpi_leds[i].led = -1;