Merge tag 'platform-drivers-x86-v4.4-2' of git://git.infradead.org/users/dvhart/linux...

Pull another x86 platform driver update from Darren Hart:
 "Support for the unfortunately rather unique ESC key on the Ideapad
  Yoga 3 and two DMI matches for rfkill support.  Solitary fix for
  potential missed errors for asus-wmi.  Downgrade a thinkpad_acpi
  message to info.

  asus-wmi:
   - fix error handling in store_sys_wmi()

  ideapad-laptop:
   - Add Lenovo Yoga 900 to no_hw_rfkill dmi list
   - include Yoga 3 1170 in add rfkill whitelist
   - add support for Yoga 3 ESC key

  thinkpad_acpi:
   - Don't yell on unsupported brightness interfaces"

* tag 'platform-drivers-x86-v4.4-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  asus-wmi: fix error handling in store_sys_wmi()
  ideapad-laptop: Add Lenovo Yoga 900 to no_hw_rfkill dmi list
  ideapad-laptop: include Yoga 3 1170 in add rfkill whitelist
  ideapad-laptop: add support for Yoga 3 ESC key
  thinkpad_acpi: Don't yell on unsupported brightness interfaces

diff --combined drivers/platform/x86/Kconfig
index 02bbc70c332dd8fb2d241974e5e41f140aa8a8c3,ecc8adf35b00a22543c0c6bce54cbd1e3c66c377..1089eaa02b00b07369b6de923c5b2217d432d26c
--- 1/drivers/platform/x86/Kconfig
--- 2/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@@ -345,6 -345,7 +345,7 @@@ config IDEAPAD_LAPTO
        depends on SERIO_I8042
        depends on BACKLIGHT_CLASS_DEVICE
        depends on ACPI_VIDEO || ACPI_VIDEO = n
+       depends on ACPI_WMI || ACPI_WMI = n
        select INPUT_SPARSEKMAP
        help
          This is a driver for Lenovo IdeaPad netbooks contains drivers for
@@@ -932,7 -933,6 +933,7 @@@ config PVPANI
  
  config INTEL_PMC_IPC
        tristate "Intel PMC IPC Driver"
 +      depends on ACPI
        ---help---
        This driver provides support for PMC control on some Intel platforms.
        The PMC is an ARC processor which defines IPC commands for communication

diff --combined drivers/platform/x86/asus-wmi.c
index e3a750224ae224b2265ef73003f2b28088518d99,179eeee227b44e3d06ddd51087d2be57398fdcd6..f96f7b865267925086f464addccd7f1ef2314ac0
--- 1/drivers/platform/x86/asus-wmi.c
--- 2/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@@ -1320,7 -1320,7 +1320,7 @@@ static ssize_t asus_hwmon_temp1(struct 
        if (err < 0)
                return err;
  
 -      value = KELVIN_TO_CELSIUS((value & 0xFFFF)) * 1000;
 +      value = DECI_KELVIN_TO_CELSIUS((value & 0xFFFF)) * 1000;
  
        return sprintf(buf, "%d\n", value);
  }
@@@ -1682,7 -1682,7 +1682,7 @@@ static ssize_t store_sys_wmi(struct asu
        int rv, err, value;
  
        value = asus_wmi_get_devstate_simple(asus, devid);
-       if (value == -ENODEV)   /* Check device presence */
+       if (value < 0)
                return value;
  
        rv = parse_arg(buf, count, &value);