diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-05 17:15:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-05 17:15:17 -0400 |
commit | b312e131cb88b83b6edc7a017b0249b4ea176edc (patch) | |
tree | 937decd0a8337a423e3c8c5195caded754bfd4ab /drivers | |
parent | 0660a9b16ad502874de3e793875fa23eed7b038a (diff) | |
parent | 475200c088a14666a03ed7f789c7db1ff5281bc5 (diff) |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
hwmon: (ltc4261) Fix error message format
hwmon: (ltc4261) Add missing newline in debug message
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hwmon/ltc4261.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hwmon/ltc4261.c b/drivers/hwmon/ltc4261.c index 267626178678..4b50601027d3 100644 --- a/drivers/hwmon/ltc4261.c +++ b/drivers/hwmon/ltc4261.c | |||
@@ -82,7 +82,7 @@ static struct ltc4261_data *ltc4261_update_device(struct device *dev) | |||
82 | val = i2c_smbus_read_byte_data(client, i); | 82 | val = i2c_smbus_read_byte_data(client, i); |
83 | if (unlikely(val < 0)) { | 83 | if (unlikely(val < 0)) { |
84 | dev_dbg(dev, | 84 | dev_dbg(dev, |
85 | "Failed to read ADC value: error %d", | 85 | "Failed to read ADC value: error %d\n", |
86 | val); | 86 | val); |
87 | ret = ERR_PTR(val); | 87 | ret = ERR_PTR(val); |
88 | goto abort; | 88 | goto abort; |
@@ -230,8 +230,7 @@ static int ltc4261_probe(struct i2c_client *client, | |||
230 | return -ENODEV; | 230 | return -ENODEV; |
231 | 231 | ||
232 | if (i2c_smbus_read_byte_data(client, LTC4261_STATUS) < 0) { | 232 | if (i2c_smbus_read_byte_data(client, LTC4261_STATUS) < 0) { |
233 | dev_err(&client->dev, "Failed to read register %d:%02x:%02x\n", | 233 | dev_err(&client->dev, "Failed to read status register\n"); |
234 | adapter->id, client->addr, LTC4261_STATUS); | ||
235 | return -ENODEV; | 234 | return -ENODEV; |
236 | } | 235 | } |
237 | 236 | ||