From 24e6416bb0c6534daf7d0b307093bd1a4baff98e Mon Sep 17 00:00:00 2001 From: Yingyuan Zhu Date: Wed, 29 Aug 2018 15:45:04 +0800 Subject: [PATCH] meson: pinctrl: fix coverity warning PD#172720: meson: pinctrl: fix coverity warning The variable "reg" should be replaced by "ret", otherwise statement "if (ret) return ret;" will not be executed. This causes "Logically dead code". Change-Id: I2a69b68dd00235198e17255f78c580212f922724 Signed-off-by: Yingyuan Zhu --- drivers/amlogic/pinctrl/pinctrl-meson.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/amlogic/pinctrl/pinctrl-meson.c b/drivers/amlogic/pinctrl/pinctrl-meson.c index 60daef2b1b4a..a44eae5b5046 100644 --- a/drivers/amlogic/pinctrl/pinctrl-meson.c +++ b/drivers/amlogic/pinctrl/pinctrl-meson.c @@ -329,7 +329,7 @@ static int meson_pinconf_get_pio(struct meson_pinctrl *pc, unsigned int pin, return ret; meson_calc_reg_and_bit(bank, pin, REG_DIR, ®, &bit); - reg = regmap_read(pc->reg_gpio, reg, &val); + ret = regmap_read(pc->reg_gpio, reg, &val); if (ret) return ret; if (val & BIT(bit)) { @@ -520,7 +520,9 @@ static int meson_gpio_get(struct gpio_chip *chip, unsigned int gpio) return ret; meson_calc_reg_and_bit(bank, gpio, REG_IN, ®, &bit); - regmap_read(pc->reg_gpio, reg, &val); + ret = regmap_read(pc->reg_gpio, reg, &val); + if (ret) + return ret; return !!(val & BIT(bit)); }