Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b5c2b3c authored by Kirill Tkhai's avatar Kirill Tkhai Committed by Matthew Garrett
Browse files

hp_wmi: Fix unregister order in hp_wmi_rfkill_setup() 



Register order is:
			wifi
			bluetooth
			wwan
			gps

So unregister order must be:
			gps
			wwan
			bluetiith
			wifi

But currently gps and wwan are swapped. Fix that.
Also fix goto links.

Signed-off-by: default avatarKirill Tkhai <tkhai@yandex.ru>
CC: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: default avatarMatthew Garrett <matthew.garrett@nebula.com>
parent 0db7fd96

drivers/platform/x86/hp-wmi.c

+8 −8
Original line number Diff line number Diff line
@@ -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;