diff options
author | Magnus Damm <damm@igel.co.jp> | 2009-04-01 10:20:58 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-01 22:19:29 -0400 |
commit | f7dd2548c471b1c7758611f6cd6393367d7ff649 (patch) | |
tree | 244e2e172157a298daae60c6e84b0fd08031142d /drivers/sh | |
parent | 3093e78ebab100ada1c724c9f751d9da39602a97 (diff) |
sh: intc: install enable, disable and shutdown callbacks
Modify the intc code to install a disable callback. The current
solution without a disable callback results in use of the
generic default_disable() function. This function is a no-op
so suspend_device_irqs() will not disable any intc interrupts
at suspend time without this patch. Also, install enable and
shutdown callbacks while at it.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh')
-rw-r--r-- | drivers/sh/intc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c index 2269fbcaa182..b75f70155823 100644 --- a/drivers/sh/intc.c +++ b/drivers/sh/intc.c | |||
@@ -707,6 +707,9 @@ void __init register_intc_controller(struct intc_desc *desc) | |||
707 | d->chip.mask = intc_disable; | 707 | d->chip.mask = intc_disable; |
708 | d->chip.unmask = intc_enable; | 708 | d->chip.unmask = intc_enable; |
709 | d->chip.mask_ack = intc_disable; | 709 | d->chip.mask_ack = intc_disable; |
710 | d->chip.enable = intc_enable; | ||
711 | d->chip.disable = intc_disable; | ||
712 | d->chip.shutdown = intc_disable; | ||
710 | d->chip.set_type = intc_set_sense; | 713 | d->chip.set_type = intc_set_sense; |
711 | 714 | ||
712 | #if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A) | 715 | #if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A) |