Merge branch 'sh-latest' of git://github.com/pmundt/linux-sh

* 'sh-latest' of git://github.com/pmundt/linux-sh:
  sh: Add default uImage rule for sh7757lcr
  sh: modify the asm/sh_eth.h to linux/sh_eth.h in sh7757lcr
  sh: userimask.c needs linux/stat.h
  sh: pfc: Add GPIO IRQ support
  sh: modify the asm/sh_eth.h to linux/sh_eth.h in some boards
  sh: pfc: Remove unused gpio_in_use member
  sh: add parameters for EHCI and RIIC in clock-sh7757.c
  sh: kexec: Add PHYSICAL_START
  SH: irq: Remove IRQF_DISABLED
  sh: pfc: get_config_reg() shift clean up
  sh: intc: Add IRQ trigger bit field check
  sh: drop unused Kconfig symbol
  sh: Fix implicit declaration of function numa_node_id
  sh: kexec: Register crashk_res
  sh: ecovec: add renesas_usbhs DMAEngine support

1 files changed, 7 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;