summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-05 22:15:17 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-05 22:15:17 +0100
commitb312e131cb88b83b6edc7a017b0249b4ea176edc (patch)
tree937decd0a8337a423e3c8c5195caded754bfd4ab /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (diff)
parenthwmon: (ltc4261) Fix error message format (diff)
downloadlinux-b312e131cb88b83b6edc7a017b0249b4ea176edc.tar.xz
linux-b312e131cb88b83b6edc7a017b0249b4ea176edc.zip
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.c5
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)
val = i2c_smbus_read_byte_data(client, i);
if (unlikely(val < 0)) {
dev_dbg(dev,
- "Failed to read ADC value: error %d",
+ "Failed to read ADC value: error %d\n",
val);
ret = ERR_PTR(val);
goto abort;
@@ -230,8 +230,7 @@ static int ltc4261_probe(struct i2c_client *client,
return -ENODEV;
if (i2c_smbus_read_byte_data(client, LTC4261_STATUS) < 0) {
- dev_err(&client->dev, "Failed to read register %d:%02x:%02x\n",
- adapter->id, client->addr, LTC4261_STATUS);
+ dev_err(&client->dev, "Failed to read status register\n");
return -ENODEV;
}