summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2013-09-13 19:59:27 +0200
committerGuenter Roeck <linux@roeck-us.net>2013-10-14 01:16:26 +0200
commit674d0ed8588c11ec9f70c8427ac83a73e0d156d5 (patch)
treeb9494f789c84371fa68af0bcc6307f392d5ef77d /drivers/hwmon
parenthwmon: (acpi_power_meter) Use return value from acpi_bus_register_driver (diff)
downloadlinux-674d0ed8588c11ec9f70c8427ac83a73e0d156d5.tar.xz
linux-674d0ed8588c11ec9f70c8427ac83a73e0d156d5.zip
hwmon: (atxp1) Set and use error code from vid_to_reg()
vid_to_reg() returns -1 if it encounters an error. Return -EINVAL instead. Its only caller, atxp1_storevcore(), doesn't use the return code but returns -1 instead, which is wrong anyway as it means -EPERM. Use the return value from vid_to_reg() instead to report the error. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/atxp1.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index aecb9ea7beb5..ddff02e3e66f 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -147,10 +147,9 @@ static ssize_t atxp1_storevcore(struct device *dev,
/* Calculate VID */
vid = vid_to_reg(vcore, data->vrm);
-
if (vid < 0) {
dev_err(dev, "VID calculation failed.\n");
- return -1;
+ return vid;
}
/*