Merge tag 'iio-for-4.12a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[sfrench/cifs-2.6.git] / drivers / iio / counter / 104-quad-8.c

diff --git a/drivers/iio/counter/104-quad-8.c b/drivers/iio/counter/104-quad-8.c
index a5913e97945eb6b5f26a418a71852fe086e6cd42..ba3d9030cd514f6ac433fb8ca7703eb97c71c0ac 100644 (file)
--- a/drivers/iio/counter/104-quad-8.c
+++ b/drivers/iio/counter/104-quad-8.c
@@ -76,7 +76,7 @@ static int quad8_read_raw(struct iio_dev *indio_dev,
                        return IIO_VAL_INT;
                }
 
-               flags = inb(base_offset);
+               flags = inb(base_offset + 1);
                borrow = flags & BIT(0);
                carry = !!(flags & BIT(1));
 
@@ -551,6 +551,7 @@ static int quad8_probe(struct device *dev, unsigned int id)
        indio_dev->num_channels = ARRAY_SIZE(quad8_channels);
        indio_dev->channels = quad8_channels;
        indio_dev->name = dev_name(dev);
+       indio_dev->dev.parent = dev;
 
        priv = iio_priv(indio_dev);
        priv->base = base[id];