From 3f6457b209adf6eaabd1a68dfdb8903293a56ad1 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Sun, 15 Apr 2012 17:41:29 +0100 Subject: [PATCH] --- yaml --- r: 304375 b: refs/heads/master c: a8c0ed756574ba5a484cd8238892f88501ff400d h: refs/heads/master i: 304373: 4a4c88a537980dfd19e6d21b3b7b8c234acb5b1b 304371: c8e29a026eaa64c3aeffbef9ea14c5d863bb4d4b 304367: 42343a3334187542b2394905c901168d6fa9071b v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/light/isl29028.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f166cb397d21..284cd4987b79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a74437e46b1513bf271ae333f81ffc238557d92d +refs/heads/master: a8c0ed756574ba5a484cd8238892f88501ff400d diff --git a/trunk/drivers/staging/iio/light/isl29028.c b/trunk/drivers/staging/iio/light/isl29028.c index 4e6ac24d7c79..11dc8a9e52af 100644 --- a/trunk/drivers/staging/iio/light/isl29028.c +++ b/trunk/drivers/staging/iio/light/isl29028.c @@ -330,7 +330,8 @@ static int isl29028_read_raw(struct iio_dev *indio_dev, mutex_lock(&chip->lock); switch (mask) { - case 0: + case IIO_CHAN_INFO_RAW: + case IIO_CHAN_INFO_PROCESSED: switch (chan->type) { case IIO_LIGHT: ret = isl29028_als_get(chip, val); @@ -391,12 +392,15 @@ static const struct iio_chan_spec isl29028_channels[] = { { .type = IIO_LIGHT, .processed_val = 1, - .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT, + .info_mask = IIO_CHAN_INFO_PROCESSED_SEPARATE_BIT | + IIO_CHAN_INFO_SCALE_SEPARATE_BIT, }, { .type = IIO_INTENSITY, + .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT, }, { .type = IIO_PROXIMITY, - .info_mask = IIO_CHAN_INFO_SAMP_FREQ_SEPARATE_BIT, + .info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT | + IIO_CHAN_INFO_SAMP_FREQ_SEPARATE_BIT, } };