Prev: [092/145] p54pci: handle dma mapping errors
Next: [114/145] x86, xen: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y
From: Greg KH on 12 Mar 2010 19:50
2.6.32-stable review patch. If anyone has any objections, please let me know.

----------------
From: Henrique de Moraes Holschuh <hmh(a)hmh.eng.br>

commit b589ea4c44170d3f7a845684e2d1b3b9571663af upstream.

The driver was not starting the NVRAM polling thread if the input
device was bound immediately after registration.

This fixes:
http://bugzilla.kernel.org/show_bug.cgi?id=15118

Reported-by: Florian Zumbiehl <florz(a)florz.de>
Signed-off-by: Henrique de Moraes Holschuh <hmh(a)hmh.eng.br>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
drivers/platform/x86/thinkpad_acpi.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)

--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -2597,16 +2597,11 @@ static int hotkey_inputdev_open(struct i
{
switch (tpacpi_lifecycle) {
case TPACPI_LIFE_INIT:
- /*
- * hotkey_init will call hotkey_poll_setup_safe
- * at the appropriate moment
- */
- return 0;
- case TPACPI_LIFE_EXITING:
- return -EBUSY;
case TPACPI_LIFE_RUNNING:
hotkey_poll_setup_safe(false);
return 0;
+ case TPACPI_LIFE_EXITING:
+ return -EBUSY;
}

/* Should only happen if tpacpi_lifecycle is corrupt */
@@ -2617,7 +2612,7 @@ static int hotkey_inputdev_open(struct i
static void hotkey_inputdev_close(struct input_dev *dev)
{
/* disable hotkey polling when possible */
- if (tpacpi_lifecycle == TPACPI_LIFE_RUNNING &&
+ if (tpacpi_lifecycle != TPACPI_LIFE_EXITING &&
!(hotkey_source_mask & hotkey_driver_mask))
hotkey_poll_setup_safe(false);
}
@@ -8362,6 +8357,9 @@ static int __init thinkpad_acpi_module_i
return ret;
}
}
+
+ tpacpi_lifecycle = TPACPI_LIFE_RUNNING;
+
ret = input_register_device(tpacpi_inputdev);
if (ret < 0) {
printk(TPACPI_ERR "unable to register input device\n");
@@ -8371,7 +8369,6 @@ static int __init thinkpad_acpi_module_i
tp_features.input_device_registered = 1;
}

- tpacpi_lifecycle = TPACPI_LIFE_RUNNING;
return 0;
}



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [092/145] p54pci: handle dma mapping errors
Next: [114/145] x86, xen: Disable highmem PTE allocation even when CONFIG_HIGHPTE=y