summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/pinctrl/intel/pinctrl-intel.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 1c85cc807a8f..d7acbb79cdf7 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -1555,10 +1555,12 @@ intel_gpio_is_requested(struct gpio_chip *chip, int base, unsigned int size)
static u32
intel_gpio_update_pad_mode(void __iomem *hostown, u32 mask, u32 value)
{
- u32 curr = readl(hostown);
- u32 updated = (curr & ~mask) | (value & mask);
+ u32 curr, updated;
+ curr = readl(hostown);
+ updated = (curr & ~mask) | (value & mask);
writel(updated, hostown);
+
return curr;
}