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

Commit 27eb9e7f authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Matthew Garrett
Browse files

msi-laptop: Use proper return codes instead of -1 



Use proper function return codes instead of -1

Signed-off-by: default avatarMaxim Mikityanskiy <maxtram95@gmail.com>
Signed-off-by: default avatarLee, Chun-Yi <jlee@suse.com>
Signed-off-by: default avatarMatthew Garrett <matthew.garrett@nebula.com>
parent 6cae06e6

drivers/platform/x86/msi-laptop.c

+6 −6
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static ssize_t set_device_state(const char *buf, size_t count, u8 mask) 
	/* read current device state */

	result = ec_read(MSI_STANDARD_EC_COMMAND_ADDRESS, &rdata);

	if (result < 0)

		return -EINVAL;

		return result;



	if (!!(rdata & mask) != status) {

		/* reverse device bit */
@@ -209,7 +209,7 @@ static ssize_t set_device_state(const char *buf, size_t count, u8 mask) 


		result = ec_write(MSI_STANDARD_EC_COMMAND_ADDRESS, wdata);

		if (result < 0)

			return -EINVAL;

			return result;

	}



	return count;
@@ -222,7 +222,7 @@ static int get_wireless_state(int *wlan, int *bluetooth) 


	result = ec_transaction(MSI_EC_COMMAND_WIRELESS, &wdata, 1, &rdata, 1);

	if (result < 0)

		return -1;

		return result;



	if (wlan)

		*wlan = !!(rdata & 8);
@@ -240,7 +240,7 @@ static int get_wireless_state_ec_standard(void) 


	result = ec_read(MSI_STANDARD_EC_COMMAND_ADDRESS, &rdata);

	if (result < 0)

		return -1;

		return result;



	wlan_s = !!(rdata & MSI_STANDARD_EC_WLAN_MASK);
@@ -258,7 +258,7 @@ static int get_threeg_exists(void) 


	result = ec_read(MSI_STANDARD_EC_DEVICES_EXISTS_ADDRESS, &rdata);

	if (result < 0)

		return -1;

		return result;



	threeg_exists = !!(rdata & MSI_STANDARD_EC_3G_MASK);
@@ -343,7 +343,7 @@ static ssize_t show_threeg(struct device *dev, 


	/* old msi ec not support 3G */

	if (old_ec_model)

		return -1;

		return -ENODEV;



	ret = get_wireless_state_ec_standard();

	if (ret < 0)