3.10-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Jonathan Cameron <ji...@kernel.org>

commit a91a73c8b39a6b8bcc53fafa5372c65387c81233 upstream.

Reported-by: Erik Habbinga <erik.habbi...@schneider-electric.com>
Signed-off-by: Jonathan Cameron <ji...@kernel.org>
Acked-by: Hartmut Knaack <knaac...@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/iio/adc/max1363.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -1214,8 +1214,8 @@ static const struct max1363_chip_info ma
                .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,
@@ -1224,8 +1224,8 @@ static const struct max1363_chip_info ma
                .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,
@@ -1274,8 +1274,8 @@ static const struct max1363_chip_info ma
                .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,
@@ -1284,8 +1284,8 @@ static const struct max1363_chip_info ma
                .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,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to