diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-08-13 14:42:55 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-08-13 14:42:55 +0200 |
| commit | 5f6f02cd49d61e9856ff2c337578316a1a1b3f88 (patch) | |
| tree | fd2e6961e8f609af41dd4a282008e1bc52cfa7c7 /drivers/iio/magnetometer/bmc150_magn.c | |
| parent | 3afa129a9de0957d72165cf08a54e5c69938011c (diff) | |
| parent | cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f (diff) | |
Merge tag 'v4.2-rc4' into devel
Linux 4.2-rc4
Diffstat (limited to 'drivers/iio/magnetometer/bmc150_magn.c')
| -rw-r--r-- | drivers/iio/magnetometer/bmc150_magn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c index 187a31fdc35a..8f6b58dd7223 100644 --- a/drivers/iio/magnetometer/bmc150_magn.c +++ b/drivers/iio/magnetometer/bmc150_magn.c @@ -706,11 +706,11 @@ static int bmc150_magn_init(struct bmc150_magn_data *data) goto err_poweroff; } if (chip_id != BMC150_MAGN_CHIP_ID_VAL) { - dev_err(&data->client->dev, "Invalid chip id 0x%x\n", ret); + dev_err(&data->client->dev, "Invalid chip id 0x%x\n", chip_id); ret = -ENODEV; goto err_poweroff; } - dev_dbg(&data->client->dev, "Chip id %x\n", ret); + dev_dbg(&data->client->dev, "Chip id %x\n", chip_id); preset = bmc150_magn_presets_table[BMC150_MAGN_DEFAULT_PRESET]; ret = bmc150_magn_set_odr(data, preset.odr); |