2 files changed, 8 insertions, 2 deletions

diff --git a/drivers/sh/intc/chip.c b/drivers/sh/intc/chip.c
index 33b2ed451e09..e0ada3773786 100644
--- a/drivers/sh/intc/chip.c
+++ b/drivers/sh/intc/chip.c
@@ -202,11 +202,16 @@ static int intc_set_type(struct irq_data *data, unsigned int type)
         if (!value)
                 return -EINVAL;
 
+        value &= ~SENSE_VALID_FLAG;
+
         ihp = intc_find_irq(d->sense, d->nr_sense, irq);
         if (ihp) {
+                /* PINT has 2-bit sense registers, should fail on EDGE_BOTH */
+                if (value >= (1 << _INTC_WIDTH(ihp->handle)))
+                        return -EINVAL;
+
                 addr = INTC_REG(d, _INTC_ADDR_E(ihp->handle), 0);
-                intc_reg_fns[_INTC_FN(ihp->handle)](addr, ihp->handle,
-                                                    value & ~SENSE_VALID_FLAG);
+                intc_reg_fns[_INTC_FN(ihp->handle)](addr, ihp->handle, value);
         }
 
         return 0;
diff --git a/drivers/sh/intc/userimask.c b/drivers/sh/intc/userimask.c
index e32304b66cf1..56bf9336b92b 100644
--- a/drivers/sh/intc/userimask.c
+++ b/drivers/sh/intc/userimask.c
@@ -13,6 +13,7 @@
 #include <linux/sysdev.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/stat.h>
 #include <asm/sizes.h>
 #include "internals.h"