msi-laptop: Use proper return codes instead of -1
authorMaxim Mikityanskiy <maxtram95@gmail.com>
Sat, 15 Dec 2012 17:31:25 +0000 (19:31 +0200)
committerMatthew Garrett <matthew.garrett@nebula.com>
Sun, 24 Feb 2013 22:49:53 +0000 (14:49 -0800)
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>
drivers/platform/x86/msi-laptop.c

index 2111dbb7e1e380263b6118218b619089298a39a2..063113ca299ed7bcc7f1976175fff3034e118c8f 100644 (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)