Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (88 commits)
  ips driver: make it less chatty
  intel_scu_ipc: fix size field for intel_scu_ipc_command
  intel_scu_ipc: return -EIO for error condition in busy_loop
  intel_scu_ipc: fix data packing of PMIC command on Moorestown
  Clean up command packing on MRST.
  zero the stack buffer before giving random garbage to the SCU
  Fix stack buffer size for IPC writev messages
  intel_scu_ipc: Use the new cpu identification function
  intel_scu_ipc: tidy up unused bits
  Remove indirect read write api support.
  intel_scu_ipc: Support Medfield processors
  intel_scu_ipc: detect CPU type automatically
  x86 plat: limit x86 platform driver menu to X86
  acpi ec_sys: Be more cautious about ec write access
  acpi ec: Fix possible double io port registration
  hp-wmi: acpi_drivers.h is already included through acpi.h two lines below
  hp-wmi: Fix mixing up of and/or directive
  dell-laptop: make dell_laptop_i8042_filter() static
  asus-laptop: fix asus_input_init error path
  msi-wmi: make needlessly global symbols static
  ...

1 files changed, 22 insertions, 11 deletions

diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c
index 2f795ce2b93..eacd5da7dd2 100644
--- a/drivers/platform/x86/intel_menlow.c
+++ b/drivers/platform/x86/intel_menlow.c
@@ -53,6 +53,8 @@ MODULE_LICENSE("GPL");
 #define MEMORY_ARG_CUR_BANDWIDTH 1
 #define MEMORY_ARG_MAX_BANDWIDTH 0
 
+static void intel_menlow_unregister_sensor(void);
+
 /*
  * GTHS returning 'n' would mean that [0,n-1] states are supported
  * In that case max_cstate would be n-1
@@ -406,8 +408,10 @@ static int intel_menlow_add_one_attribute(char *name, int mode, void *show,
         attr->handle = handle;
 
         result = device_create_file(dev, &attr->attr);
-        if (result)
+        if (result) {
+                kfree(attr);
                 return result;
+        }
 
         mutex_lock(&intel_menlow_attr_lock);
         list_add_tail(&attr->node, &intel_menlow_attr_list);
@@ -431,11 +435,11 @@ static acpi_status intel_menlow_register_sensor(acpi_handle handle, u32 lvl,
         /* _TZ must have the AUX0/1 methods */
         status = acpi_get_handle(handle, GET_AUX0, &dummy);
         if (ACPI_FAILURE(status))
-                goto not_found;
+                return (status == AE_NOT_FOUND) ? AE_OK : status;
 
         status = acpi_get_handle(handle, SET_AUX0, &dummy);
         if (ACPI_FAILURE(status))
-                goto not_found;
+                return (status == AE_NOT_FOUND) ? AE_OK : status;
 
         result = intel_menlow_add_one_attribute("aux0", 0644,
                                                 aux0_show, aux0_store,
@@ -445,17 +449,19 @@ static acpi_status intel_menlow_register_sensor(acpi_handle handle, u32 lvl,
 
         status = acpi_get_handle(handle, GET_AUX1, &dummy);
         if (ACPI_FAILURE(status))
-                goto not_found;
+                goto aux1_not_found;
 
         status = acpi_get_handle(handle, SET_AUX1, &dummy);
         if (ACPI_FAILURE(status))
-                goto not_found;
+                goto aux1_not_found;
 
         result = intel_menlow_add_one_attribute("aux1", 0644,
                                                 aux1_show, aux1_store,
                                                 &thermal->device, handle);
-        if (result)
+        if (result) {
+                intel_menlow_unregister_sensor();
                 return AE_ERROR;
+        }
 
         /*
          * create the "dabney_enabled" attribute which means the user app
@@ -465,14 +471,17 @@ static acpi_status intel_menlow_register_sensor(acpi_handle handle, u32 lvl,
         result = intel_menlow_add_one_attribute("bios_enabled", 0444,
                                                 bios_enabled_show, NULL,
                                                 &thermal->device, handle);
-        if (result)
+        if (result) {
+                intel_menlow_unregister_sensor();
                 return AE_ERROR;
+        }
 
- not_found:
+ aux1_not_found:
         if (status == AE_NOT_FOUND)
                 return AE_OK;
-        else
-                return status;
+
+        intel_menlow_unregister_sensor();
+        return status;
 }
 
 static void intel_menlow_unregister_sensor(void)
@@ -513,8 +522,10 @@ static int __init intel_menlow_module_init(void)
         status = acpi_walk_namespace(ACPI_TYPE_THERMAL, ACPI_ROOT_OBJECT,
                                      ACPI_UINT32_MAX,
                                      intel_menlow_register_sensor, NULL, NULL, NULL);
-        if (ACPI_FAILURE(status))
+        if (ACPI_FAILURE(status)) {
+                acpi_bus_unregister_driver(&intel_menlow_memory_driver);
                 return -ENODEV;
+        }
 
         return 0;
 }