pinctrl: abx500: fix bitwise AND test
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 26 Aug 2013 16:03:50 +0000 (19:03 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 28 Aug 2013 12:32:06 +0000 (14:32 +0200)
The intent here was to test if the bit was set or not but there is a
logical vs bitwise AND typo so it is true if any bits are set.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-abx500.c

index 8f25df06bc6b267a7642ef015e967b092bd70738..4780959e11d4c858e55703bee4a3835876d05550 100644 (file)
@@ -426,7 +426,7 @@ static int abx500_set_mode(struct pinctrl_dev *pctldev, struct gpio_chip *chip,
                                ret = abx500_gpio_set_bits(chip,
                                        AB8500_GPIO_ALTFUN_REG,
                                        af.alt_bit2,
-                                       !!(af.alta_val && BIT(1)));
+                                       !!(af.alta_val & BIT(1)));
                } else
                        ret = abx500_gpio_set_bits(chip, AB8500_GPIO_SEL1_REG,
                                        offset, 1);
@@ -447,7 +447,7 @@ static int abx500_set_mode(struct pinctrl_dev *pctldev, struct gpio_chip *chip,
                        ret = abx500_gpio_set_bits(chip,
                                        AB8500_GPIO_ALTFUN_REG,
                                        af.alt_bit2,
-                                       !!(af.altb_val && BIT(1)));
+                                       !!(af.altb_val & BIT(1)));
                break;
 
        case ABX500_ALT_C:
@@ -457,7 +457,7 @@ static int abx500_set_mode(struct pinctrl_dev *pctldev, struct gpio_chip *chip,
                        goto out;
 
                ret = abx500_gpio_set_bits(chip, AB8500_GPIO_ALTFUN_REG,
-                               af.alt_bit2, !!(af.altc_val && BIT(0)));
+                               af.alt_bit2, !!(af.altc_val & BIT(0)));
                if (ret < 0)
                        goto out;