diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-08-11 09:40:16 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-08-11 09:40:16 +0200 |
| commit | 41450b1b5ba101bf470b4fdf0407b30696e86bd3 (patch) | |
| tree | 6d42fc8d3afc7770d8cc0c64ad92fd0835a82c1f /drivers/iio/magnetometer/bmc150_magn.c | |
| parent | ALSA: hda - Fix pin config and mapping on Alienware 15 (diff) | |
| parent | Merge tag 'asoc-fix-v4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-41450b1b5ba101bf470b4fdf0407b30696e86bd3.tar.xz linux-41450b1b5ba101bf470b4fdf0407b30696e86bd3.zip | |
Merge branch 'for-linus' into for-next
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 d4c178869991..1347a1f2e46f 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); |