diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-29 16:48:22 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-29 16:48:22 -0800 |
| commit | 45b4539309d82ae04e6ed7de494ae194ca0755aa (patch) | |
| tree | 2ee6f8118fbce7cf8dafbb3ebd2baf69c065769d /drivers/gpio/gpio-bcm-kona.c | |
| parent | 44c3eea650001d85f6adc951b6cd6f2e6fe7a155 (diff) | |
| parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
| download | linux-45b4539309d82ae04e6ed7de494ae194ca0755aa.tar.gz linux-45b4539309d82ae04e6ed7de494ae194ca0755aa.tar.bz2 linux-45b4539309d82ae04e6ed7de494ae194ca0755aa.zip | |
Merge 3.13-rc2 into driver-core-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 72c927dc3be1..54c18c220a60 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) spin_unlock_irqrestore(&kona_gpio->lock, flags); /* return the specified bit status */ - return !!(val & bit); + return !!(val & BIT(bit)); } static int bcm_kona_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) |