[PATCH -next] iio: pressure: bmp280: fix error message for wrong chip id

[PATCH -next] iio: pressure: bmp280: fix error message for wrong chip id

[Akinobu Mita]

The bmp280 driver also supports BMP180 which has a different chip id
with BMP280.  The probe routine verifies that the device reports the
correct chip id but the error message is confusing as if BMP280's chip
id is always expected.

Reported-by: Matt Ranostay <mranostay@gmail.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Matt Ranostay <mranostay@gmail.com>
Cc: Vlad Dogaru <vlad.dogaru@intel.com>
Cc: Christoph Mair <christoph.mair@gmail.com>
Cc: Jonathan Cameron <jic23@kernel.org>
Cc: Hartmut Knaack <knaack.h@gmx.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Peter Meerwald <pmeerw@pmeerw.net>
---
 drivers/iio/pressure/bmp280.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/pressure/bmp280.c b/drivers/iio/pressure/bmp280.c
index 2f1498e..724452d 100644
--- a/drivers/iio/pressure/bmp280.c
+++ b/drivers/iio/pressure/bmp280.c
@@ -879,8 +879,8 @@ static int bmp280_probe(struct i2c_client *client,
 	if (ret < 0)
 		return ret;
 	if (chip_id != id->driver_data) {
-		dev_err(&client->dev, "bad chip id.  expected %x got %x\n",
-			BMP280_CHIP_ID, chip_id);
+		dev_err(&client->dev, "bad chip id.  expected %lx got %x\n",
+			id->driver_data, chip_id);
 		return -EINVAL;
 	}
 
-- 
2.5.0

Re: [PATCH -next] iio: pressure: bmp280: fix error message for wrong chip id

[Jonathan Cameron]

On 28/04/16 15:39, Akinobu Mita wrote:
> The bmp280 driver also supports BMP180 which has a different chip id
> with BMP280.  The probe routine verifies that the device reports the
> correct chip id but the error message is confusing as if BMP280's chip
> id is always expected.
> 
> Reported-by: Matt Ranostay <mranostay@gmail.com>
> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
> Cc: Matt Ranostay <mranostay@gmail.com>
> Cc: Vlad Dogaru <vlad.dogaru@intel.com>
> Cc: Christoph Mair <christoph.mair@gmail.com>
> Cc: Jonathan Cameron <jic23@kernel.org>
> Cc: Hartmut Knaack <knaack.h@gmx.de>
> Cc: Lars-Peter Clausen <lars@metafoo.de>
> Cc: Peter Meerwald <pmeerw@pmeerw.net>
Applied to the fixes-togreg-post-rc1 branch of iio.git
Clue to what happens next with this is in the branch name ;)

Thanks,

Jonathan
> ---
>  drivers/iio/pressure/bmp280.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/pressure/bmp280.c b/drivers/iio/pressure/bmp280.c
> index 2f1498e..724452d 100644
> --- a/drivers/iio/pressure/bmp280.c
> +++ b/drivers/iio/pressure/bmp280.c
> @@ -879,8 +879,8 @@ static int bmp280_probe(struct i2c_client *client,
>  	if (ret < 0)
>  		return ret;
>  	if (chip_id != id->driver_data) {
> -		dev_err(&client->dev, "bad chip id.  expected %x got %x\n",
> -			BMP280_CHIP_ID, chip_id);
> +		dev_err(&client->dev, "bad chip id.  expected %lx got %x\n",
> +			id->driver_data, chip_id);
>  		return -EINVAL;
>  	}
>  
>