From 20a1dffaa46c65a22904bb8028c8079739aa48c7 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Wed, 23 Jan 2013 13:26:02 +0000
Subject: [PATCH] --- yaml --- r: 350501 b: refs/heads/master c:
 49dcf086e42c990639b84152e29ebd5aa49d6dde h: refs/heads/master i:   350499:
 b1a94311883b0453f42f63c2f7b4f49c55a28dc6 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/pinctrl/pinctrl-abx500.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 99c3e3ff3443..f45997fb48b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8f96e4178920b43525da7b2635b2ee3a53896b8
+refs/heads/master: 49dcf086e42c990639b84152e29ebd5aa49d6dde
diff --git a/trunk/drivers/pinctrl/pinctrl-abx500.c b/trunk/drivers/pinctrl/pinctrl-abx500.c
index 7046aef4fd6c..539c9bb2fdfa 100644
--- a/trunk/drivers/pinctrl/pinctrl-abx500.c
+++ b/trunk/drivers/pinctrl/pinctrl-abx500.c
@@ -157,7 +157,7 @@ static int abx500_gpio_set_bits(struct gpio_chip *chip, u8 reg,
 
 	reg += offset / 8;
 	ret = abx500_mask_and_set_register_interruptible(pct->dev,
-				AB8500_MISC, reg, 1 << pos, val << pos);
+				AB8500_MISC, reg, BIT(pos), val << pos);
 	if (ret < 0)
 		dev_err(pct->dev, "%s write failed\n", __func__);
 	return ret;