Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-timberdale.c

diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index 702cca9284f1b54ef226348e083f14476d9f9a88..43774058b6930ab37d60263ee2e9e6b0d44bbf06 100644 (file)
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -167,8 +167,7 @@ static int timbgpio_irq_type(struct irq_data *d, unsigned trigger)
                if (ver < 3) {
                        ret = -EINVAL;
                        goto out;
-               }
-               else {
+               } else {
                        flr |= 1 << offset;
                        bflr |= 1 << offset;
                }