Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (140 commits)
  ACPI: processor: use .notify method instead of installing handler directly
  ACPI: button: use .notify method instead of installing handler directly
  ACPI: support acpi_device_ops .notify methods
  toshiba-acpi: remove MAINTAINERS entry
  ACPI: battery: asynchronous init
  acer-wmi: Update copyright notice & documentation
  acer-wmi: Cleanup the failure cleanup handling
  acer-wmi: Blacklist Acer Aspire One
  video: build fix
  thinkpad-acpi: rework brightness support
  thinkpad-acpi: enhanced debugging messages for the fan subdriver
  thinkpad-acpi: enhanced debugging messages for the hotkey subdriver
  thinkpad-acpi: enhanced debugging messages for rfkill subdrivers
  thinkpad-acpi: restrict access to some firmware LEDs
  thinkpad-acpi: remove HKEY disable functionality
  thinkpad-acpi: add new debug helpers and warn of deprecated atts
  thinkpad-acpi: add missing log levels
  thinkpad-acpi: cleanup debug helpers
  thinkpad-acpi: documentation cleanup
  thinkpad-acpi: drop ibm-acpi alias
  ...

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c
index b4a4aa9ee482..44166003d4ef 100644
--- a/drivers/platform/x86/tc1100-wmi.c
+++ b/drivers/platform/x86/tc1100-wmi.c
@@ -94,9 +94,8 @@ static int get_state(u32 *out, u8 instance)
                 return -ENODEV;
 
         obj = (union acpi_object *) result.pointer;
-        if (obj && obj->type == ACPI_TYPE_BUFFER &&
-                obj->buffer.length == sizeof(u32)) {
-                tmp = *((u32 *) obj->buffer.pointer);
+        if (obj && obj->type == ACPI_TYPE_INTEGER) {
+                tmp = obj->integer.value;
         } else {
                 tmp = 0;
         }
@@ -109,7 +108,7 @@ static int get_state(u32 *out, u8 instance)
                 *out = (tmp == 3) ? 1 : 0;
                 return 0;
         case TC1100_INSTANCE_JOGDIAL:
-                *out = (tmp == 1) ? 1 : 0;
+                *out = (tmp == 1) ? 0 : 1;
                 return 0;
         default:
                 return -ENODEV;