[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Fri, 9 Sep 2016 11:26:50 +0200
From: Arnd Bergmann <arnd@...db.de>
To: Linus Walleij <linus.walleij@...aro.org>
Cc: Arnd Bergmann <arnd@...db.de>, Andrew Jeffery <andrew@...id.au>,
Joel Stanley <joel@....id.au>, linux-gpio@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] 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.
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
drivers/pinctrl/aspeed/pinctrl-aspeed.c | 6 +++---
1 file 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);
--
2.9.0
Powered by blists - more mailing lists