aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pinctrl/nomadik/pinctrl-abx500.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c
index aa592ef23a29..e3689cc62a41 100644
--- a/drivers/pinctrl/nomadik/pinctrl-abx500.c
+++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c
@@ -101,15 +101,16 @@ static int abx500_gpio_get_bit(struct gpio_chip *chip, u8 reg,
101 reg += offset / 8; 101 reg += offset / 8;
102 ret = abx500_get_register_interruptible(pct->dev, 102 ret = abx500_get_register_interruptible(pct->dev,
103 AB8500_MISC, reg, &val); 103 AB8500_MISC, reg, &val);
104 104 if (ret < 0) {
105 *bit = !!(val & BIT(pos));
106
107 if (ret < 0)
108 dev_err(pct->dev, 105 dev_err(pct->dev,
109 "%s read reg =%x, offset=%x failed (%d)\n", 106 "%s read reg =%x, offset=%x failed (%d)\n",
110 __func__, reg, offset, ret); 107 __func__, reg, offset, ret);
108 return ret;
109 }
111 110
112 return ret; 111 *bit = !!(val & BIT(pos));
112
113 return 0;
113} 114}
114 115
115static int abx500_gpio_set_bits(struct gpio_chip *chip, u8 reg, 116static int abx500_gpio_set_bits(struct gpio_chip *chip, u8 reg,