Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

Pull x86 platform updates from Matthew Garrett:
 "Nothing amazing here, almost entirely cleanups and minor bugfixes and
  one bit of hardware enablement in the amilo-rfkill driver"

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
  platform/x86: panasonic-laptop: reuse module_acpi_driver
  samsung-laptop: fix config build error
  platform: x86: remove unnecessary platform_set_drvdata()
  amilo-rfkill: Enable using amilo-rfkill with the FSC Amilo L1310.
  wmi: parse_wdg() should return kernel error codes
  hp_wmi: Fix unregister order in hp_wmi_rfkill_setup()
  platform: replace strict_strto*() with kstrto*()
  x86: irst: use module_acpi_driver to simplify the code
  x86: smartconnect: use module_acpi_driver to simplify the code
  platform samsung-q10: use ACPI instead of direct EC calls
  thinkpad_acpi: add the ability setting TPACPI_LED_NONE by quirk
  thinkpad_acpi: return -NODEV while operating uninitialized LEDs

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index d6970f47ae72..1c86fa0857c8 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -725,7 +725,7 @@ static int hp_wmi_rfkill_setup(struct platform_device *device)
                                            (void *) HPWMI_WWAN);
                 if (!wwan_rfkill) {
                         err = -ENOMEM;
-                        goto register_gps_error;
+                        goto register_bluetooth_error;
                 }
                 rfkill_init_sw_state(wwan_rfkill,
                                      hp_wmi_get_sw_state(HPWMI_WWAN));
@@ -733,7 +733,7 @@ static int hp_wmi_rfkill_setup(struct platform_device *device)
                                     hp_wmi_get_hw_state(HPWMI_WWAN));
                 err = rfkill_register(wwan_rfkill);
                 if (err)
-                        goto register_wwan_err;
+                        goto register_wwan_error;
         }
 
         if (wireless & 0x8) {
@@ -743,7 +743,7 @@ static int hp_wmi_rfkill_setup(struct platform_device *device)
                                                 (void *) HPWMI_GPS);
                 if (!gps_rfkill) {
                         err = -ENOMEM;
-                        goto register_bluetooth_error;
+                        goto register_wwan_error;
                 }
                 rfkill_init_sw_state(gps_rfkill,
                                      hp_wmi_get_sw_state(HPWMI_GPS));
@@ -755,16 +755,16 @@ static int hp_wmi_rfkill_setup(struct platform_device *device)
         }
 
         return 0;
-register_wwan_err:
-        rfkill_destroy(wwan_rfkill);
-        wwan_rfkill = NULL;
-        if (gps_rfkill)
-                rfkill_unregister(gps_rfkill);
 register_gps_error:
         rfkill_destroy(gps_rfkill);
         gps_rfkill = NULL;
         if (bluetooth_rfkill)
                 rfkill_unregister(bluetooth_rfkill);
+register_wwan_error:
+        rfkill_destroy(wwan_rfkill);
+        wwan_rfkill = NULL;
+        if (gps_rfkill)
+                rfkill_unregister(gps_rfkill);
 register_bluetooth_error:
         rfkill_destroy(bluetooth_rfkill);
         bluetooth_rfkill = NULL;