7 files changed, 67 insertions, 44 deletions

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 7222a18a0319..caf873c14bfb 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -943,7 +943,11 @@ int __init acpi_ec_ecdt_probe(void)
                 boot_ec->command_addr = ecdt_ptr->control.address;
                 boot_ec->data_addr = ecdt_ptr->data.address;
                 boot_ec->gpe = ecdt_ptr->gpe;
-                boot_ec->handle = ACPI_ROOT_OBJECT;
+                if (ACPI_FAILURE(acpi_get_handle(NULL, ecdt_ptr->id,
+                                &boot_ec->handle))) {
+                        pr_info("Failed to locate handle for boot EC\n");
+                        boot_ec->handle = ACPI_ROOT_OBJECT;
+                }
         } else {
                 /* This workaround is needed only on some broken machines,
                  * which require early EC, but fail to provide ECDT */
diff --git a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c
index 2e9ce94798c7..3f51b7e84a17 100644
--- a/drivers/acpi/executer/exregion.c
+++ b/drivers/acpi/executer/exregion.c
@@ -338,6 +338,7 @@ acpi_ex_pci_config_space_handler(u32 function,
         acpi_status status = AE_OK;
         struct acpi_pci_id *pci_id;
         u16 pci_register;
+        u32 value32;
 
         ACPI_FUNCTION_TRACE(ex_pci_config_space_handler);
 
@@ -364,9 +365,9 @@ acpi_ex_pci_config_space_handler(u32 function,
         switch (function) {
         case ACPI_READ:
 
-                *value = 0;
                 status = acpi_os_read_pci_configuration(pci_id, pci_register,
-                                                        value, bit_width);
+                                                        &value32, bit_width);
+                *value = value32;
                 break;
 
         case ACPI_WRITE:
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 48cb705b274a..c8e3cba423ef 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -256,22 +256,28 @@ static int acpi_fan_add(struct acpi_device *device)
 
         cdev = thermal_cooling_device_register("Fan", device,
                                                 &fan_cooling_ops);
-        if (cdev)
+        if (IS_ERR(cdev)) {
+                result = PTR_ERR(cdev);
+                goto end;
+        }
+        if (cdev) {
                 printk(KERN_INFO PREFIX
                         "%s is registered as cooling_device%d\n",
                         device->dev.bus_id, cdev->id);
-        else
-                goto end;
-        acpi_driver_data(device) = cdev;
-        result = sysfs_create_link(&device->dev.kobj, &cdev->device.kobj,
-                                        "thermal_cooling");
-        if (result)
-                return result;
 
-        result = sysfs_create_link(&cdev->device.kobj, &device->dev.kobj,
-                                       "device");
-        if (result)
-                return result;
+                acpi_driver_data(device) = cdev;
+                result = sysfs_create_link(&device->dev.kobj,
+                                           &cdev->device.kobj,
+                                           "thermal_cooling");
+                if (result)
+                        return result;
+
+                result = sysfs_create_link(&cdev->device.kobj,
+                                           &device->dev.kobj,
+                                           "device");
+                if (result)
+                        return result;
+        }
 
         result = acpi_fan_add_fs(device);
         if (result)
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 75ccf5d18bf4..a3cc8a98255c 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -670,21 +670,26 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
 
         pr->cdev = thermal_cooling_device_register("Processor", device,
                                                 &processor_cooling_ops);
-        if (pr->cdev)
+        if (IS_ERR(pr->cdev)) {
+                result = PTR_ERR(pr->cdev);
+                goto end;
+        }
+        if (pr->cdev) {
                 printk(KERN_INFO PREFIX
                         "%s is registered as cooling_device%d\n",
                         device->dev.bus_id, pr->cdev->id);
-        else
-                goto end;
 
-        result = sysfs_create_link(&device->dev.kobj, &pr->cdev->device.kobj,
-                                        "thermal_cooling");
-        if (result)
-                return result;
-        result = sysfs_create_link(&pr->cdev->device.kobj, &device->dev.kobj,
-                                        "device");
-        if (result)
-                return result;
+                result = sysfs_create_link(&device->dev.kobj,
+                                           &pr->cdev->device.kobj,
+                                           "thermal_cooling");
+                if (result)
+                        return result;
+                result = sysfs_create_link(&pr->cdev->device.kobj,
+                                           &device->dev.kobj,
+                                           "device");
+                if (result)
+                        return result;
+        }
 
         if (pr->flags.throttling) {
                 printk(KERN_INFO PREFIX "%s [%s] (supports",
@@ -809,10 +814,12 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
 
         acpi_processor_remove_fs(device);
 
-        sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
-        sysfs_remove_link(&pr->cdev->device.kobj, "device");
-        thermal_cooling_device_unregister(pr->cdev);
-        pr->cdev = NULL;
+        if (pr->cdev) {
+                sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
+                sysfs_remove_link(&pr->cdev->device.kobj, "device");
+                thermal_cooling_device_unregister(pr->cdev);
+                pr->cdev = NULL;
+        }
 
         processors[pr->id] = NULL;
 
@@ -826,8 +833,6 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
  *      Acpi processor hotplug support                                      *
  ****************************************************************************/
 
-static int is_processor_present(acpi_handle handle);
-
 static int is_processor_present(acpi_handle handle)
 {
         acpi_status status;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 980e1c33e6c5..6f3b217699e9 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -364,7 +364,7 @@ int acpi_processor_resume(struct acpi_device * device)
         return 0;
 }
 
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
 static int tsc_halts_in_c(int state)
 {
         switch (boot_cpu_data.x86_vendor) {
@@ -544,7 +544,7 @@ static void acpi_processor_idle(void)
                 /* Get end time (ticks) */
                 t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
 
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
                 /* TSC halts in C2, so notify users */
                 if (tsc_halts_in_c(ACPI_STATE_C2))
                         mark_tsc_unstable("possible TSC halt in C2");
@@ -609,7 +609,7 @@ static void acpi_processor_idle(void)
                         acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
                 }
 
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
                 /* TSC halts in C3, so notify users */
                 if (tsc_halts_in_c(ACPI_STATE_C3))
                         mark_tsc_unstable("TSC halts in C3");
@@ -1500,7 +1500,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         acpi_idle_do_entry(cx);
         t2 = inl(acpi_gbl_FADT.xpm_timer_block.address);
 
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
         /* TSC could halt in idle, so notify users */
         if (tsc_halts_in_c(cx->type))
                 mark_tsc_unstable("TSC halts in idle");;
@@ -1614,7 +1614,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                 spin_unlock(&c3_lock);
         }
 
-#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86_TSC)
+#if defined (CONFIG_GENERIC_TIME) && defined (CONFIG_X86)
         /* TSC could halt in idle, so notify users */
         if (tsc_halts_in_c(ACPI_STATE_C3))
                 mark_tsc_unstable("TSC halts in idle");
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 34f157571080..eba55b7d6c95 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -36,16 +36,20 @@ ACPI_MODULE_NAME("utils");
 /* --------------------------------------------------------------------------
                             Object Evaluation Helpers
    -------------------------------------------------------------------------- */
+static void
+acpi_util_eval_error(acpi_handle h, acpi_string p, acpi_status s)
+{
 #ifdef ACPI_DEBUG_OUTPUT
-#define acpi_util_eval_error(h,p,s) {\
-        char prefix[80] = {'\0'};\
-        struct acpi_buffer buffer = {sizeof(prefix), prefix};\
-        acpi_get_name(h, ACPI_FULL_PATHNAME, &buffer);\
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluate [%s.%s]: %s\n",\
-                (char *) prefix, p, acpi_format_exception(s))); }
+        char prefix[80] = {'\0'};
+        struct acpi_buffer buffer = {sizeof(prefix), prefix};
+        acpi_get_name(h, ACPI_FULL_PATHNAME, &buffer);
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluate [%s.%s]: %s\n",
+                (char *) prefix, p, acpi_format_exception(s)));
 #else
-#define acpi_util_eval_error(h,p,s)
+        return;
 #endif
+}
+
 acpi_status
 acpi_extract_package(union acpi_object *package,
                      struct acpi_buffer *format, struct acpi_buffer *buffer)
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 7f714fa2a454..12cce69b5441 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -731,6 +731,9 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 
                 device->cdev = thermal_cooling_device_register("LCD",
                                         device->dev, &video_cooling_ops);
+                if (IS_ERR(device->cdev))
+                        return;
+
                 if (device->cdev) {
                         printk(KERN_INFO PREFIX
                                 "%s is registered as cooling_device%d\n",