Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3b25245 authored by Frank Li's avatar Frank Li Committed by Greg Kroah-Hartman
Browse files

iio: light: vcnl4035: fixed chip ID check 



commit a551c26e8e568fad42120843521529241b9bceec upstream.

VCNL4035 register(0xE) ID_L and ID_M define as:

 ID_L: 0x80
 ID_H: 7:6 (0:0)
       5:4 (0:0) slave address = 0x60 (7-bit)
           (0:1) slave address = 0x51 (7-bit)
           (1:0) slave address = 0x40 (7-bit)
           (1:0) slave address = 0x41 (7-bit)
       3:0 Version code default	(0:0:0:0)

So just check ID_L.

Fixes: 55707294 ("iio: light: Add support for vishay vcnl4035")
Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20230501143605.1615549-1-Frank.Li@nxp.com


Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 711049e3

drivers/iio/light/vcnl4035.c

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * TODO: Proximity

 */

#include <linux/bitops.h>

#include <linux/bitfield.h>

#include <linux/i2c.h>

#include <linux/module.h>

#include <linux/pm_runtime.h>
@@ -42,6 +43,7 @@ 
#define VCNL4035_ALS_PERS_MASK		GENMASK(3, 2)

#define VCNL4035_INT_ALS_IF_H_MASK	BIT(12)

#define VCNL4035_INT_ALS_IF_L_MASK	BIT(13)

#define VCNL4035_DEV_ID_MASK		GENMASK(7, 0)



/* Default values */

#define VCNL4035_MODE_ALS_ENABLE	BIT(0)
@@ -415,6 +417,7 @@ static int vcnl4035_init(struct vcnl4035_data *data) 
		return ret;

	}



	id = FIELD_GET(VCNL4035_DEV_ID_MASK, id);

	if (id != VCNL4035_DEV_ID_VAL) {

		dev_err(&data->client->dev, "Wrong id, got %x, expected %x\n",

			id, VCNL4035_DEV_ID_VAL);