From 3c1a2c2c466b4a91a06eb5c0ac6e5272c41c7a63 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Mon, 19 Mar 2012 10:31:58 -0600 Subject: [PATCH] --- yaml --- r: 303303 b: refs/heads/master c: d941136fc6ead10a7ff319bad199869b593962c5 h: refs/heads/master i: 303301: c9fdd303dbf21f040d4a2b032568903867b1877c 303299: f924bc03473476988a6e289a041b58b174e65438 303295: 1e7b2cf9a54ab0a7b692cee907ad614f9f861cb5 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-tegra.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b81f39ae533a..639c16399690 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bee6417c9444ca62e67956dcbcf25fe20feb869 +refs/heads/master: d941136fc6ead10a7ff319bad199869b593962c5 diff --git a/trunk/drivers/gpio/gpio-tegra.c b/trunk/drivers/gpio/gpio-tegra.c index 12f349b3830d..4383a7205349 100644 --- a/trunk/drivers/gpio/gpio-tegra.c +++ b/trunk/drivers/gpio/gpio-tegra.c @@ -224,6 +224,9 @@ static int tegra_gpio_irq_set_type(struct irq_data *d, unsigned int type) spin_unlock_irqrestore(&bank->lvl_lock[port], flags); + tegra_gpio_mask_write(GPIO_MSK_OE(gpio), gpio, 0); + tegra_gpio_enable(gpio); + if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH)) __irq_set_handler_locked(d->irq, handle_level_irq); else if (type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))