Commit b312e131 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 0660a9b1 475200c0
...@@ -82,7 +82,7 @@ static struct ltc4261_data *ltc4261_update_device(struct device *dev) ...@@ -82,7 +82,7 @@ static struct ltc4261_data *ltc4261_update_device(struct device *dev)
val = i2c_smbus_read_byte_data(client, i); val = i2c_smbus_read_byte_data(client, i);
if (unlikely(val < 0)) { if (unlikely(val < 0)) {
dev_dbg(dev, dev_dbg(dev,
"Failed to read ADC value: error %d", "Failed to read ADC value: error %d\n",
val); val);
ret = ERR_PTR(val); ret = ERR_PTR(val);
goto abort; goto abort;
...@@ -230,8 +230,7 @@ static int ltc4261_probe(struct i2c_client *client, ...@@ -230,8 +230,7 @@ static int ltc4261_probe(struct i2c_client *client,
return -ENODEV; return -ENODEV;
if (i2c_smbus_read_byte_data(client, LTC4261_STATUS) < 0) { if (i2c_smbus_read_byte_data(client, LTC4261_STATUS) < 0) {
dev_err(&client->dev, "Failed to read register %d:%02x:%02x\n", dev_err(&client->dev, "Failed to read status register\n");
adapter->id, client->addr, LTC4261_STATUS);
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment