Merge tag 'v3.16-rc5' into sched/core, to refresh the branch before applying bigger tree-wide changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
author: Ingo Molnar <mingo@kernel.org> 2014-07-16 09:10:07 -0400
committer: Ingo Molnar <mingo@kernel.org> 2014-07-16 09:10:07 -0400
commit: d26fad5b38e1c4667d4f2604936e59c837caa54d (patch)
tree: 04b524a69a0129c181567445bff18847a1b44721 /drivers/iio/adc
parent: e720fff6341fe4b95e5a93c939bd3c77fa55ced4 (diff)
parent: 1795cd9b3a91d4b5473c97f491d63892442212ab (diff)
5 files changed, 18 insertions, 13 deletions
diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c
index 39b4cb48d738..6eba301ee03d 100644
--- a/drivers/iio/adc/ad799x.c
+++ b/drivers/iio/adc/ad799x.c
@@ -427,9 +427,12 @@ static int ad799x_write_event_value(struct iio_dev *indio_dev,
        int ret;
        struct ad799x_state *st = iio_priv(indio_dev);
+        if (val < 0 || val > RES_MASK(chan->scan_type.realbits))
+                return -EINVAL;
        mutex_lock(&indio_dev->mlock);
        ret = ad799x_i2c_write16(st, ad799x_threshold_reg(chan, dir, info),
-                val);
+                val << chan->scan_type.shift);
        mutex_unlock(&indio_dev->mlock);
        return ret;
@@ -452,7 +455,8 @@ static int ad799x_read_event_value(struct iio_dev *indio_dev,
        mutex_unlock(&indio_dev->mlock);
        if (ret < 0)
                return ret;
-        *val = valin;
+        *val = (valin >> chan->scan_type.shift) &
+                RES_MASK(chan->scan_type.realbits);
        return IIO_VAL_INT;
 }
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 3b5bacd4d8da..2b6a9ce9927c 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -510,12 +510,11 @@ static int at91_adc_channel_init(struct iio_dev *idev)
        return idev->num_channels;
 }
-static u8 at91_adc_get_trigger_value_by_name(struct iio_dev *idev,
+static int at91_adc_get_trigger_value_by_name(struct iio_dev *idev,
                                             struct at91_adc_trigger *triggers,
                                             const char *trigger_name)
 {
        struct at91_adc_state *st = iio_priv(idev);
-        u8 value = 0;
        int i;
        for (i = 0; i < st->trigger_number; i++) {
@@ -528,15 +527,16 @@ static u8 at91_adc_get_trigger_value_by_name(struct iio_dev *idev,
                        return -ENOMEM;
                if (strcmp(trigger_name, name) == 0) {
-                        value = triggers[i].value;
                        kfree(name);
-                        break;
+                        if (triggers[i].value == 0)
+                                return -EINVAL;
+                        return triggers[i].value;
                }
                kfree(name);
        }
-        return value;
+        return -EINVAL;
 }
 static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state)
@@ -546,14 +546,14 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state)
        struct iio_buffer *buffer = idev->buffer;
        struct at91_adc_reg_desc *reg = st->registers;
        u32 status = at91_adc_readl(st, reg->trigger_register);
-        u8 value;
+        int value;
        u8 bit;
        value = at91_adc_get_trigger_value_by_name(idev,
                                                   st->trigger_list,
                                                   idev->trig->name);
-        if (value == 0)
+        if (value < 0)
-                return -EINVAL;
+                return value;
        if (state) {
                st->buffer = kmalloc(idev->scan_bytes, GFP_KERNEL);
diff --git a/drivers/iio/adc/men_z188_adc.c b/drivers/iio/adc/men_z188_adc.c
index 6989c16aec2b..b58d6302521f 100644
--- a/drivers/iio/adc/men_z188_adc.c
+++ b/drivers/iio/adc/men_z188_adc.c
@@ -121,8 +121,8 @@ static int men_z188_probe(struct mcb_device *dev,
        indio_dev->num_channels = ARRAY_SIZE(z188_adc_iio_channels);
        mem = mcb_request_mem(dev, "z188-adc");
-        if (!mem)
+        if (IS_ERR(mem))
-                return -ENOMEM;
+                return PTR_ERR(mem);
        adc->base = ioremap(mem->start, resource_size(mem));
        if (adc->base == NULL)
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index a4db3026bec6..d5dc4c6ce86c 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -374,7 +374,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
                        return -EAGAIN;
                }
        }
-        map_val = chan->channel + TOTAL_CHANNELS;
+        map_val = adc_dev->channel_step[chan->scan_index];
        /*
         * We check the complete FIFO. We programmed just one entry but in case
diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
index 7de1c4c87942..eb86786e698e 100644
--- a/drivers/iio/adc/twl4030-madc.c
+++ b/drivers/iio/adc/twl4030-madc.c
@@ -645,6 +645,7 @@ int twl4030_get_madc_conversion(int channel_no)
        req.channels = (1 << channel_no);
        req.method = TWL4030_MADC_SW2;
        req.active = 0;
+        req.raw = 0;
        req.func_cb = NULL;
        ret = twl4030_madc_conversion(&req);
        if (ret < 0)
author	Ingo Molnar <mingo@kernel.org>	2014-07-16 09:10:07 -0400
committer	Ingo Molnar <mingo@kernel.org>	2014-07-16 09:10:07 -0400
commit	d26fad5b38e1c4667d4f2604936e59c837caa54d (patch)
tree	04b524a69a0129c181567445bff18847a1b44721 /drivers/iio/adc
parent	e720fff6341fe4b95e5a93c939bd3c77fa55ced4 (diff)
parent	1795cd9b3a91d4b5473c97f491d63892442212ab (diff)