summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2009-12-09 01:36:25 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-26 07:41:21 -0700
commit5d0e3bb2aa35bc12469cb2c67d60b513e7e7fcb3 (patch)
tree9ab4bbc677ca5d87b9b942434bff0cd761a516db /drivers/platform
parent8bf934d74b1e22fbf206a163653915a12ab67350 (diff)
thinkpad-acpi: silence bogus complain during rmmod
commit 6b30eb7d211840ba1a03f855d9e7b80a921368f2 upstream. Fix this bogus warning during module shutdown, when backlight event reporting is enabled: "thinkpad_acpi: required events 0x00018000 not enabled!" Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 8194d165cec6..e7e3108138a0 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -2190,7 +2190,8 @@ static int hotkey_mask_set(u32 mask)
fwmask, hotkey_acpi_mask);
}
- hotkey_mask_warn_incomplete_mask();
+ if (tpacpi_lifecycle != TPACPI_LIFE_EXITING)
+ hotkey_mask_warn_incomplete_mask();
return rc;
}