projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'devicetree-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hwmon
/
amc6821.c
diff --git
a/drivers/hwmon/amc6821.c
b/drivers/hwmon/amc6821.c
index 4fe49d2bfe1de5c44b61b6bb3cbcfa3acecec41e..eea81729651309b0598791d04778822e1f7cc7ff 100644
(file)
--- a/
drivers/hwmon/amc6821.c
+++ b/
drivers/hwmon/amc6821.c
@@
-364,7
+364,7
@@
static ssize_t set_pwm1_enable(
if (config < 0) {
dev_err(&client->dev,
"Error reading configuration register, aborting.\n");
if (config < 0) {
dev_err(&client->dev,
"Error reading configuration register, aborting.\n");
- return
-EIO
;
+ return
config
;
}
switch (val) {
}
switch (val) {
@@
-416,11
+416,9
@@
static ssize_t get_temp_auto_point_temp(
case 1:
return sprintf(buf, "%d\n",
data->temp1_auto_point_temp[ix] * 1000);
case 1:
return sprintf(buf, "%d\n",
data->temp1_auto_point_temp[ix] * 1000);
- break;
case 2:
return sprintf(buf, "%d\n",
data->temp2_auto_point_temp[ix] * 1000);
case 2:
return sprintf(buf, "%d\n",
data->temp2_auto_point_temp[ix] * 1000);
- break;
default:
dev_dbg(dev, "Unknown attr->nr (%d).\n", nr);
return -EINVAL;
default:
dev_dbg(dev, "Unknown attr->nr (%d).\n", nr);
return -EINVAL;
@@
-513,7
+511,6
@@
static ssize_t set_temp_auto_point_temp(
count = -EIO;
}
goto EXIT;
count = -EIO;
}
goto EXIT;
- break;
case 1:
ptemp[1] = clamp_val(val / 1000, (ptemp[0] & 0x7C) + 4, 124);
ptemp[1] &= 0x7C;
case 1:
ptemp[1] = clamp_val(val / 1000, (ptemp[0] & 0x7C) + 4, 124);
ptemp[1] &= 0x7C;
@@
-665,7
+662,7
@@
static ssize_t set_fan1_div(
if (config < 0) {
dev_err(&client->dev,
"Error reading configuration register, aborting.\n");
if (config < 0) {
dev_err(&client->dev,
"Error reading configuration register, aborting.\n");
- return
-EIO
;
+ return
config
;
}
mutex_lock(&data->update_lock);
switch (val) {
}
mutex_lock(&data->update_lock);
switch (val) {