]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
thinkpad_acpi: Fix inconsistent mute LED after resume
authorTakashi Iwai <tiwai@suse.de>
Wed, 12 Feb 2014 15:32:45 +0000 (16:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 May 2014 11:32:56 +0000 (13:32 +0200)
commit 119f449866ad18785b0445adaf0d2859c6dbdaa3 upstream.

The mute LED states have to be restored after resume.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=70351
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/platform/x86/thinkpad_acpi.c

index defb6afc1409cc7fff0863d6829c5c26478b6a4a..e2a91c845ac930a09256576f30108decb7e6f506 100644 (file)
@@ -8447,9 +8447,21 @@ static void mute_led_exit(void)
                tpacpi_led_set(i, false);
 }
 
+static void mute_led_resume(void)
+{
+       int i;
+
+       for (i = 0; i < TPACPI_LED_MAX; i++) {
+               struct tp_led_table *t = &led_tables[i];
+               if (t->state >= 0)
+                       mute_led_on_off(t, t->state);
+       }
+}
+
 static struct ibm_struct mute_led_driver_data = {
        .name = "mute_led",
        .exit = mute_led_exit,
+       .resume = mute_led_resume,
 };
 
 /****************************************************************************