hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Use proper function return codes instead of -1

Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
This commit is contained in:
Maxim Mikityanskiy 2012-12-15 19:31:25 +02:00 committed by Matthew Garrett
parent 6cae06e603
commit 27eb9e7f12
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/platform/x86/msi-laptop.c
View File

@ -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)