From ddc41ac32357feb80c880776002c9109089ef0ca Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Wed, 19 Jan 2011 08:16:29 +0000
Subject: [PATCH] --- yaml --- r: 232358 b: refs/heads/master c:
 8a5a778665efb3a5f16ebb6fbc13356907e45775 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/sh/intc/chip.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e6ae46ef3444..a365b75ce4ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24ee7d79c5885275a531431c3b687b3a7919eee4
+refs/heads/master: 8a5a778665efb3a5f16ebb6fbc13356907e45775
diff --git a/trunk/drivers/sh/intc/chip.c b/trunk/drivers/sh/intc/chip.c
index de885a0f917a..f33e2dd97934 100644
--- a/trunk/drivers/sh/intc/chip.c
+++ b/trunk/drivers/sh/intc/chip.c
@@ -173,7 +173,8 @@ int intc_set_priority(unsigned int irq, unsigned int prio)
 	return 0;
 }
 
-#define VALID(x) (x | 0x80)
+#define SENSE_VALID_FLAG 0x80
+#define VALID(x) (x | SENSE_VALID_FLAG)
 
 static unsigned char intc_irq_sense_table[IRQ_TYPE_SENSE_MASK + 1] = {
 	[IRQ_TYPE_EDGE_FALLING] = VALID(0),
@@ -201,7 +202,8 @@ static int intc_set_type(struct irq_data *data, unsigned int type)
 	ihp = intc_find_irq(d->sense, d->nr_sense, irq);
 	if (ihp) {
 		addr = INTC_REG(d, _INTC_ADDR_E(ihp->handle), 0);
-		intc_reg_fns[_INTC_FN(ihp->handle)](addr, ihp->handle, value);
+		intc_reg_fns[_INTC_FN(ihp->handle)](addr, ihp->handle,
+						    value & ~SENSE_VALID_FLAG);
 	}
 
 	return 0;