Merge branch 'staging-linus' into staging-next

This is to get the comedi fixes, and resolve the issue in comdi_test.c
and comedi_fops.c that were caused by changes in both branches.

It also allows the fwserial driver changes to be applied, as they
required the fixes that are in staging-linus.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

16 files changed, 67 insertions, 19 deletions

diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index fe4bcd7c5b12..05e996fafc9d 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -8,6 +8,7 @@ config HID_SENSOR_ACCEL_3D
         select IIO_BUFFER
         select IIO_TRIGGERED_BUFFER
         select HID_SENSOR_IIO_COMMON
+        select HID_SENSOR_IIO_TRIGGER
         tristate "HID Accelerometers 3D"
         help
           Say yes here to build support for the HID SENSOR
diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
index a6f4fc5f8201..e36107dc30b9 100644
--- a/drivers/iio/adc/ad7266.c
+++ b/drivers/iio/adc/ad7266.c
@@ -411,7 +411,11 @@ static int __devinit ad7266_probe(struct spi_device *spi)
                 if (ret)
                         goto error_put_reg;
 
-                st->vref_uv = regulator_get_voltage(st->reg);
+                ret = regulator_get_voltage(st->reg);
+                if (ret < 0)
+                        goto error_disable_reg;
+
+                st->vref_uv = ret;
         } else {
                 /* Use internal reference */
                 st->vref_uv = 2500000;
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 03b85940f4ba..315bed1f401f 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -80,7 +80,7 @@ static irqreturn_t at91_adc_trigger_handler(int irq, void *p)
                 *timestamp = pf->timestamp;
         }
 
-        iio_push_to_buffers(indio_dev, (u8 *)st->buffer);
+        iio_push_to_buffers(idev, (u8 *)st->buffer);
 
         iio_trigger_notify_done(idev->trig);
 
diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index 0ba4fea960ac..aac572290cbf 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -1558,17 +1558,18 @@ static int __devinit max1363_probe(struct i2c_client *client,
 
         return 0;
 error_free_irq:
-        free_irq(st->client->irq, indio_dev);
+        if (client->irq)
+                free_irq(st->client->irq, indio_dev);
 error_uninit_buffer:
         iio_triggered_buffer_cleanup(indio_dev);
 error_free_available_scan_masks:
         kfree(indio_dev->available_scan_masks);
-error_unregister_map:
-        iio_map_array_unregister(indio_dev, client->dev.platform_data);
 error_disable_reg:
         regulator_disable(st->reg);
 error_put_reg:
         regulator_put(st->reg);
+error_unregister_map:
+        iio_map_array_unregister(indio_dev, client->dev.platform_data);
 error_free_device:
         iio_device_free(indio_dev);
 error_out:
@@ -1585,10 +1586,8 @@ static int __devexit max1363_remove(struct i2c_client *client)
                 free_irq(st->client->irq, indio_dev);
         iio_triggered_buffer_cleanup(indio_dev);
         kfree(indio_dev->available_scan_masks);
-        if (!IS_ERR(st->reg)) {
-                regulator_disable(st->reg);
-                regulator_put(st->reg);
-        }
+        regulator_disable(st->reg);
+        regulator_put(st->reg);
         iio_map_array_unregister(indio_dev, client->dev.platform_data);
         iio_device_free(indio_dev);
 
diff --git a/drivers/iio/common/hid-sensors/Kconfig b/drivers/iio/common/hid-sensors/Kconfig
index ae10778da7aa..1178121b55b0 100644
--- a/drivers/iio/common/hid-sensors/Kconfig
+++ b/drivers/iio/common/hid-sensors/Kconfig
@@ -6,7 +6,7 @@ menu "Hid Sensor IIO Common"
 config HID_SENSOR_IIO_COMMON
         tristate "Common modules for all HID Sensor IIO drivers"
         depends on HID_SENSOR_HUB
-        select IIO_TRIGGER if IIO_BUFFER
+        select HID_SENSOR_IIO_TRIGGER if IIO_BUFFER
         help
           Say yes here to build support for HID sensor to use
           HID sensor common processing for attributes and IIO triggers.
@@ -14,6 +14,17 @@ config HID_SENSOR_IIO_COMMON
           HID sensor drivers, this module contains processing for those
           attributes.
 
+config HID_SENSOR_IIO_TRIGGER
+        tristate "Common module (trigger) for all HID Sensor IIO drivers"
+        depends on HID_SENSOR_HUB && HID_SENSOR_IIO_COMMON
+        select IIO_TRIGGER
+        help
+          Say yes here to build trigger support for HID sensors.
+          Triggers will be send if all requested attributes were read.
+
+          If this driver is compiled as a module, it will be named
+          hid-sensor-trigger.
+
 config HID_SENSOR_ENUM_BASE_QUIRKS
         bool "ENUM base quirks for HID Sensor IIO drivers"
         depends on HID_SENSOR_IIO_COMMON
diff --git a/drivers/iio/common/hid-sensors/Makefile b/drivers/iio/common/hid-sensors/Makefile
index 1f463e00c242..22e7c5a82325 100644
--- a/drivers/iio/common/hid-sensors/Makefile
+++ b/drivers/iio/common/hid-sensors/Makefile
@@ -3,4 +3,5 @@
 #
 
 obj-$(CONFIG_HID_SENSOR_IIO_COMMON) += hid-sensor-iio-common.o
-hid-sensor-iio-common-y := hid-sensor-attributes.o hid-sensor-trigger.o
+obj-$(CONFIG_HID_SENSOR_IIO_TRIGGER) += hid-sensor-trigger.o
+hid-sensor-iio-common-y := hid-sensor-attributes.o
diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c
index 14991ac55f26..4aca1895ce52 100644
--- a/drivers/iio/dac/ad5380.c
+++ b/drivers/iio/dac/ad5380.c
@@ -406,7 +406,11 @@ static int __devinit ad5380_probe(struct device *dev, struct regmap *regmap,
                         goto error_free_reg;
                 }
 
-                st->vref = regulator_get_voltage(st->vref_reg);
+                ret = regulator_get_voltage(st->vref_reg);
+                if (ret < 0)
+                        goto error_disable_reg;
+
+                st->vref = ret;
         } else {
                 st->vref = st->chip_info->int_vref;
                 ctrl |= AD5380_CTRL_INT_VREF_EN;
diff --git a/drivers/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c
index 3310cbbd41e7..ecb639540dff 100644
--- a/drivers/iio/dac/ad5446.c
+++ b/drivers/iio/dac/ad5446.c
@@ -226,7 +226,11 @@ static int __devinit ad5446_probe(struct device *dev, const char *name,
                 if (ret)
                         goto error_put_reg;
 
-                voltage_uv = regulator_get_voltage(reg);
+                ret = regulator_get_voltage(reg);
+                if (ret < 0)
+                        goto error_disable_reg;
+
+                voltage_uv = ret;
         }
 
         indio_dev = iio_device_alloc(sizeof(*st));
diff --git a/drivers/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c
index 242bdc7d0044..7f7c026b9d8a 100644
--- a/drivers/iio/dac/ad5504.c
+++ b/drivers/iio/dac/ad5504.c
@@ -296,7 +296,11 @@ static int __devinit ad5504_probe(struct spi_device *spi)
                 if (ret)
                         goto error_put_reg;
 
-                voltage_uv = regulator_get_voltage(reg);
+                ret = regulator_get_voltage(reg);
+                if (ret < 0)
+                        goto error_disable_reg;
+
+                voltage_uv = ret;
         }
 
         spi_set_drvdata(spi, indio_dev);
diff --git a/drivers/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c
index 6a7d6a48cc6d..14ea3dbf4902 100644
--- a/drivers/iio/dac/ad5624r_spi.c
+++ b/drivers/iio/dac/ad5624r_spi.c
@@ -238,7 +238,11 @@ static int __devinit ad5624r_probe(struct spi_device *spi)
                 if (ret)
                         goto error_put_reg;
 
-                voltage_uv = regulator_get_voltage(st->reg);
+                ret = regulator_get_voltage(st->reg);
+                if (ret < 0)
+                        goto error_disable_reg;
+
+                voltage_uv = ret;
         }
 
         spi_set_drvdata(spi, indio_dev);
diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c
index bc92ff9309c2..01eb1d0e4e41 100644
--- a/drivers/iio/dac/ad5686.c
+++ b/drivers/iio/dac/ad5686.c
@@ -332,7 +332,11 @@ static int __devinit ad5686_probe(struct spi_device *spi)
                 if (ret)
                         goto error_put_reg;
 
-                voltage_uv = regulator_get_voltage(st->reg);
+                ret = regulator_get_voltage(st->reg);
+                if (ret < 0)
+                        goto error_disable_reg;
+
+                voltage_uv = ret;
         }
 
         st->chip_info =
diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c
index 2bd2e37280ff..6efe83e32ac6 100644
--- a/drivers/iio/dac/ad5791.c
+++ b/drivers/iio/dac/ad5791.c
@@ -365,7 +365,11 @@ static int __devinit ad5791_probe(struct spi_device *spi)
                 if (ret)
                         goto error_put_reg_pos;
 
-                pos_voltage_uv = regulator_get_voltage(st->reg_vdd);
+                ret = regulator_get_voltage(st->reg_vdd);
+                if (ret < 0)
+                        goto error_disable_reg_pos;
+
+                pos_voltage_uv = ret;
         }
 
         st->reg_vss = regulator_get(&spi->dev, "vss");
@@ -374,7 +378,11 @@ static int __devinit ad5791_probe(struct spi_device *spi)
                 if (ret)
                         goto error_put_reg_neg;
 
-                neg_voltage_uv = regulator_get_voltage(st->reg_vss);
+                ret = regulator_get_voltage(st->reg_vss);
+                if (ret < 0)
+                        goto error_disable_reg_neg;
+
+                neg_voltage_uv = ret;
         }
 
         st->pwr_down = true;
@@ -428,6 +436,7 @@ error_put_reg_neg:
         if (!IS_ERR(st->reg_vss))
                 regulator_put(st->reg_vss);
 
+error_disable_reg_pos:
         if (!IS_ERR(st->reg_vdd))
                 regulator_disable(st->reg_vdd);
 error_put_reg_pos:
diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
index e35bb8f6fe75..c7de8b5a01ff 100644
--- a/drivers/iio/frequency/adf4350.c
+++ b/drivers/iio/frequency/adf4350.c
@@ -173,7 +173,7 @@ static int adf4350_set_freq(struct adf4350_state *st, unsigned long long freq)
                         } while ((st->r1_mod > ADF4350_MAX_MODULUS) && r_cnt);
                 } while (r_cnt == 0);
 
-                tmp = freq * (u64)st->r1_mod + (st->fpfd > 1);
+                tmp = freq * (u64)st->r1_mod + (st->fpfd >> 1);
                 do_div(tmp, st->fpfd); /* Div round closest (n + d/2)/d */
                 st->r0_fract = do_div(tmp, st->r1_mod);
                 st->r0_int = tmp;
diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig
index 48ed1483ff27..96b68f63a902 100644
--- a/drivers/iio/gyro/Kconfig
+++ b/drivers/iio/gyro/Kconfig
@@ -17,6 +17,7 @@ config HID_SENSOR_GYRO_3D
         select IIO_BUFFER
         select IIO_TRIGGERED_BUFFER
         select HID_SENSOR_IIO_COMMON
+        select HID_SENSOR_IIO_TRIGGER
         tristate "HID Gyroscope 3D"
         help
           Say yes here to build support for the HID SENSOR
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index 1763c9bcb98a..dbf80abc834f 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -47,6 +47,7 @@ config HID_SENSOR_ALS
         select IIO_BUFFER
         select IIO_TRIGGERED_BUFFER
         select HID_SENSOR_IIO_COMMON
+        select HID_SENSOR_IIO_TRIGGER
         tristate "HID ALS"
         help
           Say yes here to build support for the HID SENSOR
diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig
index c1f0cdd57037..ff11d68225cf 100644
--- a/drivers/iio/magnetometer/Kconfig
+++ b/drivers/iio/magnetometer/Kconfig
@@ -8,6 +8,7 @@ config HID_SENSOR_MAGNETOMETER_3D
         select IIO_BUFFER
         select IIO_TRIGGERED_BUFFER
         select HID_SENSOR_IIO_COMMON
+        select HID_SENSOR_IIO_TRIGGER
         tristate "HID Magenetometer 3D"
         help
           Say yes here to build support for the HID SENSOR