watchdog: gpio-wdt: be more strict about hw_algo matching
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Thu, 30 Jul 2015 09:32:23 +0000 (11:32 +0200)
committerWim Van Sebroeck <wim@iguana.be>
Wed, 9 Sep 2015 19:35:14 +0000 (21:35 +0200)
strncmp(algo, "toggle", 6) doesn't compare the trailing '\0' byte, so
using

hw_algo = "toggleboggle"

is recognized the same way as

hw_algo = "toggle"

. While this doesn't introduce any problems for a device tree that
sticks to the documented settings it's still ugly.

Fix this by using strcmp to only match on "toggle" and "level".

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/gpio_wdt.c

index 1687cc2d71223cc799fbb60bb1d3f0914d7c3ada..57d30f1f55ab49938b3e11f298e433fce3d39a00 100644 (file)
@@ -182,10 +182,10 @@ static int gpio_wdt_probe(struct platform_device *pdev)
        ret = of_property_read_string(pdev->dev.of_node, "hw_algo", &algo);
        if (ret)
                return ret;
-       if (!strncmp(algo, "toggle", 6)) {
+       if (!strcmp(algo, "toggle")) {
                priv->hw_algo = HW_ALGO_TOGGLE;
                f = GPIOF_IN;
-       } else if (!strncmp(algo, "level", 5)) {
+       } else if (!strcmp(algo, "level")) {
                priv->hw_algo = HW_ALGO_LEVEL;
                f = priv->active_low ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
        } else {