5 files changed, 28 insertions, 13 deletions

diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index 743485e4d6f8..345395e9dc6e 100644
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -4,6 +4,7 @@
 
 menuconfig IIO
         tristate "Industrial I/O support"
+        select ANON_INODES
         help
           The industrial I/O subsystem provides a unified framework for
           drivers for many different types of embedded sensors using a
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 90f596db940d..a80d23628f14 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -110,6 +110,7 @@ config AD799X
 config AT91_ADC
         tristate "Atmel AT91 ADC"
         depends on ARCH_AT91
+        depends on INPUT
         select IIO_BUFFER
         select IIO_TRIGGERED_BUFFER
         select SYSFS
diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index 9cf3229a7272..1b3b74be5c20 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -1252,8 +1252,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
                 .num_modes = ARRAY_SIZE(max1238_mode_list),
                 .default_mode = s0to11,
                 .info = &max1238_info,
-                .channels = max1238_channels,
-                .num_channels = ARRAY_SIZE(max1238_channels),
+                .channels = max1038_channels,
+                .num_channels = ARRAY_SIZE(max1038_channels),
         },
         [max11605] = {
                 .bits = 8,
@@ -1262,8 +1262,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
                 .num_modes = ARRAY_SIZE(max1238_mode_list),
                 .default_mode = s0to11,
                 .info = &max1238_info,
-                .channels = max1238_channels,
-                .num_channels = ARRAY_SIZE(max1238_channels),
+                .channels = max1038_channels,
+                .num_channels = ARRAY_SIZE(max1038_channels),
         },
         [max11606] = {
                 .bits = 10,
@@ -1312,8 +1312,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
                 .num_modes = ARRAY_SIZE(max1238_mode_list),
                 .default_mode = s0to11,
                 .info = &max1238_info,
-                .channels = max1238_channels,
-                .num_channels = ARRAY_SIZE(max1238_channels),
+                .channels = max1138_channels,
+                .num_channels = ARRAY_SIZE(max1138_channels),
         },
         [max11611] = {
                 .bits = 10,
@@ -1322,8 +1322,8 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
                 .num_modes = ARRAY_SIZE(max1238_mode_list),
                 .default_mode = s0to11,
                 .info = &max1238_info,
-                .channels = max1238_channels,
-                .num_channels = ARRAY_SIZE(max1238_channels),
+                .channels = max1138_channels,
+                .num_channels = ARRAY_SIZE(max1138_channels),
         },
         [max11612] = {
                 .bits = 12,
diff --git a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
index 372964635ccf..403dd3d8986e 100644
--- a/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
+++ b/drivers/iio/common/hid-sensors/hid-sensor-attributes.c
@@ -327,7 +327,7 @@ int hid_sensor_format_scale(u32 usage_id,
         *val0 = 1;
         *val1 = 0;
 
-        for (i = 0; ARRAY_SIZE(unit_conversion); ++i) {
+        for (i = 0; i < ARRAY_SIZE(unit_conversion); ++i) {
                 if (unit_conversion[i].usage_id == usage_id &&
                         unit_conversion[i].unit == attr_info->units) {
                         exp  = hid_sensor_convert_exponent(
@@ -343,15 +343,28 @@ int hid_sensor_format_scale(u32 usage_id,
 }
 EXPORT_SYMBOL(hid_sensor_format_scale);
 
-int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev,
+int hid_sensor_get_reporting_interval(struct hid_sensor_hub_device *hsdev,
                                         u32 usage_id,
                                         struct hid_sensor_common *st)
 {
-
         sensor_hub_input_get_attribute_info(hsdev,
                                         HID_FEATURE_REPORT, usage_id,
                                         HID_USAGE_SENSOR_PROP_REPORT_INTERVAL,
                                         &st->poll);
+        /* Default unit of measure is milliseconds */
+        if (st->poll.units == 0)
+                st->poll.units = HID_USAGE_SENSOR_UNITS_MILLISECOND;
+        return 0;
+
+}
+
+int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev,
+                                        u32 usage_id,
+                                        struct hid_sensor_common *st)
+{
+
+
+        hid_sensor_get_reporting_interval(hsdev, usage_id, st);
 
         sensor_hub_input_get_attribute_info(hsdev,
                                         HID_FEATURE_REPORT, usage_id,
diff --git a/drivers/staging/iio/Documentation/iio_utils.h b/drivers/staging/iio/Documentation/iio_utils.h
index 2064839ef2cd..a9cfc06edb01 100644
--- a/drivers/staging/iio/Documentation/iio_utils.h
+++ b/drivers/staging/iio/Documentation/iio_utils.h
@@ -318,7 +318,7 @@ inline int build_channel_array(const char *device_dir,
                                 free(filename);
                                 goto error_close_dir;
                         }
-                        fscanf(sysfsfp, "%u", &ret);
+                        fscanf(sysfsfp, "%i", &ret);
                         if (ret == 1)
                                 (*counter)++;
                         fclose(sysfsfp);
@@ -350,7 +350,7 @@ inline int build_channel_array(const char *device_dir,
                                 ret = -errno;
                                 goto error_cleanup_array;
                         }
-                        fscanf(sysfsfp, "%u", &current_enabled);
+                        fscanf(sysfsfp, "%i", &current_enabled);
                         fclose(sysfsfp);
 
                         if (!current_enabled) {