4 files changed, 36 insertions, 10 deletions

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index aaaa61ea4217..a26655881e6a 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -5,6 +5,11 @@
 menuconfig MISC_DEVICES
         bool "Misc devices"
         default y
+        ---help---
+          Say Y here to get to see options for device drivers from various
+          different categories. This option alone does not add any kernel code.
+
+          If you say N, all options in this submenu will be skipped and disabled.
 
 if MISC_DEVICES
 
@@ -200,14 +205,22 @@ config THINKPAD_ACPI_BAY
 config THINKPAD_ACPI_INPUT_ENABLED
         bool "Enable input layer support by default"
         depends on THINKPAD_ACPI
-        default y
+        default n
         ---help---
-          Enables hot key handling over the input layer by default.  If unset,
-          the driver does not enable any hot key handling by default, and also
-          starts up with a mostly empty keymap.
-
-          If you are not sure, say Y here.  Say N to retain the deprecated
-          behavior of ibm-acpi, and thinkpad-acpi for kernels up to 2.6.21.
+          This option enables thinkpad-acpi hot key handling over the input
+          layer at driver load time.  When it is unset, the driver does not
+          enable hot key handling by default, and also starts up with a mostly
+          empty keymap.
+
+          This option should be enabled if you have a new enough HAL or other
+          userspace support that properly handles the thinkpad-acpi event
+          device.  It auto-tunes the hot key support to those reported by the
+          firmware and enables it automatically.
+
+          If unsure, say N here to retain the old behaviour of ibm-acpi, and
+          thinkpad-acpi up to kernel 2.6.21: userspace will have to enable and
+          set up the thinkpad-acpi hot key handling using the sysfs interace
+          after loading the driver.
 
 
 endif # MISC_DEVICES
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 14ee06c8f127..91da6880ae93 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -845,7 +845,7 @@ static struct sony_nc_event sony_C_events[] = {
 };
 
 /* SNC-only model map */
-struct dmi_system_id sony_nc_ids[] = {
+static struct dmi_system_id sony_nc_ids[] = {
                 {
                         .ident = "Sony Vaio FE Series",
                         .callback = sony_nc_C_enable,
@@ -942,6 +942,11 @@ static int sony_nc_resume(struct acpi_device *device)
                 }
         }
 
+        /* set the last requested brightness level */
+        if (sony_backlight_device &&
+                        !sony_backlight_update_status(sony_backlight_device))
+                printk(KERN_WARNING DRV_PFX "unable to restore brightness level");
+
         /* re-initialize models with specific requirements */
         dmi_check_system(sony_nc_ids);
 
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index fa80f355e522..f6cd34a3dbac 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -4668,12 +4668,15 @@ static int __init thinkpad_acpi_module_init(void)
                 thinkpad_acpi_module_exit();
                 return ret;
         }
+        tp_features.platform_drv_registered = 1;
+
         ret = tpacpi_create_driver_attributes(&tpacpi_pdriver.driver);
         if (ret) {
                 printk(IBM_ERR "unable to create sysfs driver attributes\n");
                 thinkpad_acpi_module_exit();
                 return ret;
         }
+        tp_features.platform_drv_attrs_registered = 1;
 
 
         /* Device initialization */
@@ -4756,8 +4759,11 @@ static void thinkpad_acpi_module_exit(void)
         if (tpacpi_pdev)
                 platform_device_unregister(tpacpi_pdev);
 
-        tpacpi_remove_driver_attributes(&tpacpi_pdriver.driver);
-        platform_driver_unregister(&tpacpi_pdriver);
+        if (tp_features.platform_drv_attrs_registered)
+                tpacpi_remove_driver_attributes(&tpacpi_pdriver.driver);
+
+        if (tp_features.platform_drv_registered)
+                platform_driver_unregister(&tpacpi_pdriver);
 
         if (proc_dir)
                 remove_proc_entry(IBM_PROC_DIR, acpi_root_dir);
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index 88af089d6494..eee8809a50d9 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -246,6 +246,8 @@ static struct {
         u16 wan:1;
         u16 fan_ctrl_status_undef:1;
         u16 input_device_registered:1;
+        u16 platform_drv_registered:1;
+        u16 platform_drv_attrs_registered:1;
 } tp_features;
 
 struct thinkpad_id_data {