diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-12-09 08:04:37 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-12-09 08:04:37 -0500 |
| commit | bdc54ef45d7670aeb52ce73f8b7ad5f3e5563661 (patch) | |
| tree | da6e170ce87891a0242de88d8d7c1ba34faf9bb7 /drivers/gpio/gpio-bcm-kona.c | |
| parent | 33e0aae11e4854c792e9871f94da6d28bf2e2bb8 (diff) | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
Merge tag 'v3.13-rc3' into devel
Linux 3.13-rc3
Diffstat (limited to 'drivers/gpio/gpio-bcm-kona.c')
| -rw-r--r-- | drivers/gpio/gpio-bcm-kona.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c index 3437414eaef2..233d088ac59f 100644 --- a/drivers/gpio/gpio-bcm-kona.c +++ b/drivers/gpio/gpio-bcm-kona.c | |||
| @@ -158,7 +158,7 @@ static int bcm_kona_gpio_get(struct gpio_chip *chip, unsigned gpio) | |||
| 158 | spin_unlock_irqrestore(&kona_gpio->lock, flags); | 158 | spin_unlock_irqrestore(&kona_gpio->lock, flags); |
| 159 | 159 | ||
| 160 | /* return the specified bit status */ | 160 | /* return the specified bit status */ |
| 161 | return !!(val & bit); | 161 | return !!(val & BIT(bit)); |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | static int bcm_kona_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) | 164 | static int bcm_kona_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) |