Merge tag 'gpio-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux-2.6-block.git] / drivers / staging / vme / devices / vme_pio2_gpio.c

diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
index 3304d9227c3cb9d8f4e4794f2f3e077a7b3fb2e6..c64776f71809f0fc9ee04232a9cef72647897989 100644 (file)
--- a/drivers/staging/vme/devices/vme_pio2_gpio.c
+++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
@@ -58,14 +58,14 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
        if (reg & PIO2_CHANNEL_BIT[offset]) {
                if (card->bank[PIO2_CHANNEL_BANK[offset]].config != BOTH)
                        return 0;
-               else
-                       return 1;
-       } else {
-               if (card->bank[PIO2_CHANNEL_BANK[offset]].config != BOTH)
-                       return 1;
-               else
-                       return 0;
+
+               return 1;
        }
+
+       if (card->bank[PIO2_CHANNEL_BANK[offset]].config != BOTH)
+               return 1;
+
+       return 0;
 }
 
 static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,