Commit 7b8377862bd816a5e8ceb5c713d88bf82555c8d4
Exists in
master
and in
20 other branches
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck: "Two minor fixes in emc2103 and applesmc drivers." * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (emc2103) Fix use of an uninitilized variable in error case hwmon: (applesmc) Limit key length in warning messages
Showing 2 changed files Side-by-side Diff
drivers/hwmon/applesmc.c
| ... | ... | @@ -215,7 +215,7 @@ |
| 215 | 215 | int i; |
| 216 | 216 | |
| 217 | 217 | if (send_command(cmd) || send_argument(key)) { |
| 218 | - pr_warn("%s: read arg fail\n", key); | |
| 218 | + pr_warn("%.4s: read arg fail\n", key); | |
| 219 | 219 | return -EIO; |
| 220 | 220 | } |
| 221 | 221 | |
| ... | ... | @@ -223,7 +223,7 @@ |
| 223 | 223 | |
| 224 | 224 | for (i = 0; i < len; i++) { |
| 225 | 225 | if (__wait_status(0x05)) { |
| 226 | - pr_warn("%s: read data fail\n", key); | |
| 226 | + pr_warn("%.4s: read data fail\n", key); | |
| 227 | 227 | return -EIO; |
| 228 | 228 | } |
| 229 | 229 | buffer[i] = inb(APPLESMC_DATA_PORT); |
drivers/hwmon/emc2103.c
| ... | ... | @@ -451,11 +451,15 @@ |
| 451 | 451 | data->fan_rpm_control = true; |
| 452 | 452 | break; |
| 453 | 453 | default: |
| 454 | - mutex_unlock(&data->update_lock); | |
| 455 | - return -EINVAL; | |
| 454 | + count = -EINVAL; | |
| 455 | + goto err; | |
| 456 | 456 | } |
| 457 | 457 | |
| 458 | - read_u8_from_i2c(client, REG_FAN_CONF1, &conf_reg); | |
| 458 | + result = read_u8_from_i2c(client, REG_FAN_CONF1, &conf_reg); | |
| 459 | + if (result) { | |
| 460 | + count = result; | |
| 461 | + goto err; | |
| 462 | + } | |
| 459 | 463 | |
| 460 | 464 | if (data->fan_rpm_control) |
| 461 | 465 | conf_reg |= 0x80; |
| ... | ... | @@ -463,7 +467,7 @@ |
| 463 | 467 | conf_reg &= ~0x80; |
| 464 | 468 | |
| 465 | 469 | i2c_smbus_write_byte_data(client, REG_FAN_CONF1, conf_reg); |
| 466 | - | |
| 470 | +err: | |
| 467 | 471 | mutex_unlock(&data->update_lock); |
| 468 | 472 | return count; |
| 469 | 473 | } |