From 59cb2422d1968c6042054dbde63a54666503a6c8 Mon Sep 17 00:00:00 2001 From: Tomasz Figa Date: Fri, 21 Sep 2012 07:33:52 +0900 Subject: [PATCH] --- yaml --- r: 327023 b: refs/heads/master c: 3da23f27a0f6a5e44a01813a1c0a662011e5c221 h: refs/heads/master i: 327021: d14f1d0c9e94150eaa29f9a6cd75def458fe77fb 327019: bdc7b59b5c5671e2fb3bfbf810fea324b7eab3be 327015: bab431257eccd9c789af89f8cfdbe4dcb9cfc189 327007: a9229f9f8ce71f0e3b76588170cd099d3dee49d0 v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinctrl-exynos.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9e56353c584c..f3613815aa26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee2f573c4206ff3c4dbff2296c8d383d045c80a2 +refs/heads/master: 3da23f27a0f6a5e44a01813a1c0a662011e5c221 diff --git a/trunk/drivers/pinctrl/pinctrl-exynos.c b/trunk/drivers/pinctrl/pinctrl-exynos.c index c2fa85f18764..46cd637f4804 100644 --- a/trunk/drivers/pinctrl/pinctrl-exynos.c +++ b/trunk/drivers/pinctrl/pinctrl-exynos.c @@ -58,7 +58,7 @@ static void exynos_gpio_irq_mask(struct irq_data *irqd) unsigned long mask; mask = readl(d->virt_base + reg_mask); - mask |= ~(1 << edata->pin); + mask |= 1 << edata->pin; writel(mask, d->virt_base + reg_mask); } @@ -290,7 +290,7 @@ static void exynos_wkup_irq_mask(struct irq_data *irqd) unsigned long mask; mask = readl(d->virt_base + reg_mask); - mask &= ~(1 << pin); + mask |= 1 << pin; writel(mask, d->virt_base + reg_mask); }