From d7357b8d1521dfbfc4bc2d7cbd17e547c05968f0 Mon Sep 17 00:00:00 2001 From: Maxim Mikityanskiy Date: Sat, 15 Dec 2012 19:31:25 +0200 Subject: [PATCH] --- yaml --- r: 360528 b: refs/heads/master c: 27eb9e7f1211ecab64027113478867adfed6a7c8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/msi-laptop.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a7b8ab230ec6..4e3e55b4a8a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cae06e603339f99334bc6b276e2ac619cf0d476 +refs/heads/master: 27eb9e7f1211ecab64027113478867adfed6a7c8 diff --git a/trunk/drivers/platform/x86/msi-laptop.c b/trunk/drivers/platform/x86/msi-laptop.c index 2111dbb7e1e3..063113ca299e 100644 --- a/trunk/drivers/platform/x86/msi-laptop.c +++ b/trunk/drivers/platform/x86/msi-laptop.c @@ -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)