mirror of
https://github.com/torvalds/linux.git
synced 2026-09-22 04:34:03 +02:00
iio: light: al3010: read both ALS ADC registers again
al3010_read_raw() used to read two adjacent registers
until the driver was modernized using the regmap framework.
That cleanup accidentally replaced the 16-bit word read
with a single byte read. I'm reverting latter.
Fixes: 0e5e21e23d ("iio: light: al3010: Implement regmap support")
Signed-off-by: Alexander A. Klimov <grandmaster@al2klimov.de>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
parent
3c5eed894e
commit
ee78fae068
|
|
@ -111,7 +111,8 @@ static int al3010_read_raw(struct iio_dev *indio_dev,
|
|||
int *val2, long mask)
|
||||
{
|
||||
struct al3010_data *data = iio_priv(indio_dev);
|
||||
int ret, gain, raw;
|
||||
int ret, gain;
|
||||
__le16 raw;
|
||||
|
||||
switch (mask) {
|
||||
case IIO_CHAN_INFO_RAW:
|
||||
|
|
@ -120,11 +121,12 @@ static int al3010_read_raw(struct iio_dev *indio_dev,
|
|||
* - low byte of output is stored at AL3010_REG_DATA_LOW
|
||||
* - high byte of output is stored at AL3010_REG_DATA_LOW + 1
|
||||
*/
|
||||
ret = regmap_read(data->regmap, AL3010_REG_DATA_LOW, &raw);
|
||||
ret = regmap_bulk_read(data->regmap, AL3010_REG_DATA_LOW,
|
||||
&raw, sizeof(raw));
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
*val = raw;
|
||||
*val = le16_to_cpu(raw);
|
||||
|
||||
return IIO_VAL_INT;
|
||||
case IIO_CHAN_INFO_SCALE:
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user