summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-09 11:26:50 +0200
committerLinus Walleij <linus.walleij@linaro.org>2016-09-13 10:41:49 +0200
commit55956035266d8f5d825f30add0d7af3850cca0ad (patch)
tree6247ce5809160d1e0616bbd79784a5528ce81949
parent03e9888f955cc0950a15713a93af8946c56a37bb (diff)
downloadlinux-55956035266d8f5d825f30add0d7af3850cca0ad.tar.bz2
pinctrl: aspeed: fix regmap error handling
The newly added aspeed driver tries to check for a negative return value from a pinctrl function, but stores the intermediate value in a 'bool' variable, which cannot work: drivers/pinctrl/aspeed/pinctrl-aspeed.c: In function 'aspeed_sig_expr_set': drivers/pinctrl/aspeed/pinctrl-aspeed.c:192:11: error: comparison of constant '0' with boolean expression is always false [-Werror=bool-compare] This slightly reworks the logic to use an explicit comparison with zero before assigning to the temporary variable. Reported-by: Colin King <colin.king@canonical.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/aspeed/pinctrl-aspeed.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.c b/drivers/pinctrl/aspeed/pinctrl-aspeed.c
index 7d461fc30d3c..0391f9f13f3e 100644
--- a/drivers/pinctrl/aspeed/pinctrl-aspeed.c
+++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.c
@@ -187,10 +187,10 @@ static bool aspeed_sig_expr_set(const struct aspeed_sig_expr *expr,
continue;
ret = regmap_update_bits(map, desc->reg, desc->mask,
- pattern << __ffs(desc->mask));
+ pattern << __ffs(desc->mask)) == 0;
- if (ret < 0)
- return false;
+ if (!ret)
+ return ret;
}
return aspeed_sig_expr_eval(expr, enable, map);