On 20/07/14 17:51, Jonathan Cameron wrote: > On 14/07/14 23:58, Srinivas Pandruvada wrote: >> On 07/14/2014 01:38 PM, Peter Meerwald wrote: >>> Signed-off-by: Peter Meerwald <pmeerw@xxxxxxxxxx> >>> Cc: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx> > This one doesn't apply cleanly on top of Srinivas' patches that I took > earlier today. I'll hold it for now as it's not as urgent as the next > one and sort it out after Srinivas' series is all in place. > No longer relevant as far as I can see so dropped. > J >>> --- >>> drivers/iio/accel/kxcjk-1013.c | 6 +++--- >>> 1 file changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c >>> index 72a6dbb..a11588c 100644 >>> --- a/drivers/iio/accel/kxcjk-1013.c >>> +++ b/drivers/iio/accel/kxcjk-1013.c >>> @@ -144,7 +144,7 @@ static int kxcjk1013_chip_ack_intr(struct kxcjk1013_data *data) >>> >>> ret = i2c_smbus_read_byte_data(data->client, KXCJK1013_REG_INT_REL); >>> if (ret < 0) { >>> - dev_err(&data->client->dev, "Error writing reg_int_rel\n"); >>> + dev_err(&data->client->dev, "Error reading reg_int_rel\n"); >>> return ret; >>> } >>> >>> @@ -183,7 +183,7 @@ static int kxcjk1013_chip_init(struct kxcjk1013_data *data) >>> ret = i2c_smbus_write_byte_data(data->client, KXCJK1013_REG_CTRL1, >>> ret); >>> if (ret < 0) { >>> - dev_err(&data->client->dev, "Error reading reg_ctrl\n"); >>> + dev_err(&data->client->dev, "Error writing reg_ctrl1\n"); >>> return ret; >>> } >>> >>> @@ -337,7 +337,7 @@ static int kxcjk1013_get_acc_reg(struct kxcjk1013_data *data, int axis) >>> ret = i2c_smbus_read_word_data(data->client, reg); >>> if (ret < 0) { >>> dev_err(&data->client->dev, >>> - "failed to read accel_%c registers\n", 'x' + axis); >>> + "failed to read accel_%c register\n", 'x' + axis); >>> return ret; >>> } >>> >>> >> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx> >> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-iio" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html