Merge tag 'gpio-v3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux-2.6-block.git] / drivers / gpio / gpiolib.c

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 568aa2b6bdb019e9285372d731d8a9e9bcbed1f7..1ca9295b2c1017df34dacad5c0217677b6c2d60d 100644 (file)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1659,7 +1659,7 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
                                      unsigned int idx,
                                      enum gpio_lookup_flags *flags)
 {
-       static const char *suffixes[] = { "gpios", "gpio" };
+       static const char * const suffixes[] = { "gpios", "gpio" };
        char prop_name[32]; /* 32 is max size of property name */
        enum of_gpio_flags of_flags;
        struct gpio_desc *desc;
@@ -1667,9 +1667,11 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
 
        for (i = 0; i < ARRAY_SIZE(suffixes); i++) {
                if (con_id)
-                       snprintf(prop_name, 32, "%s-%s", con_id, suffixes[i]);
+                       snprintf(prop_name, sizeof(prop_name), "%s-%s", con_id,
+                                                              suffixes[i]);
                else
-                       snprintf(prop_name, 32, "%s", suffixes[i]);
+                       snprintf(prop_name, sizeof(prop_name), "%s",
+                                                              suffixes[i]);
 
                desc = of_get_named_gpiod_flags(dev->of_node, prop_name, idx,
                                                &of_flags);