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

[cascardo/linux.git] / drivers / staging / iio / impedance-analyzer / ad5933.c

diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index 97d4b3f..b6bd609 100644 (file)
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -190,6 +190,7 @@ static int ad5933_cmd(struct ad5933_state *st, unsigned char cmd)
 static int ad5933_reset(struct ad5933_state *st)
 {
        unsigned char dat = st->ctrl_lb | AD5933_CTRL_RESET;
+
        return ad5933_i2c_write(st->client,
                        AD5933_REG_CONTROL_LB, 1, &dat);
 }
@@ -217,7 +218,7 @@ static int ad5933_set_freq(struct ad5933_state *st,
 {
        unsigned long long freqreg;
        union {
-               u32 d32;
+               __be32 d32;
                u8 d8[4];
        } dat;
 
@@ -241,7 +242,7 @@ static int ad5933_set_freq(struct ad5933_state *st,
 
 static int ad5933_setup(struct ad5933_state *st)
 {
-       unsigned short dat;
+       __be16 dat;
        int ret;
 
        ret = ad5933_reset(st);
@@ -294,7 +295,7 @@ static ssize_t ad5933_show_frequency(struct device *dev,
        int ret;
        unsigned long long freqreg;
        union {
-               u32 d32;
+               __be32 d32;
                u8 d8[4];
        } dat;
 
@@ -399,7 +400,7 @@ static ssize_t ad5933_store(struct device *dev,
        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
        u16 val;
        int i, ret = 0;
-       unsigned short dat;
+       __be16 dat;
 
        if (this_attr->address != AD5933_IN_PGA_GAIN) {
                ret = kstrtou16(buf, 10, &val);
@@ -518,7 +519,7 @@ static int ad5933_read_raw(struct iio_dev *indio_dev,
                           long m)
 {
        struct ad5933_state *st = iio_priv(indio_dev);
-       unsigned short dat;
+       __be16 dat;
        int ret = -EINVAL;
 
        mutex_lock(&indio_dev->mlock);