summaryrefslogtreecommitdiff
path: root/drivers/sh
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-04-01 14:20:58 +0000
committerPaul Mundt <lethal@linux-sh.org>2009-04-02 11:19:29 +0900
commitf7dd2548c471b1c7758611f6cd6393367d7ff649 (patch)
tree244e2e172157a298daae60c6e84b0fd08031142d /drivers/sh
parent3093e78ebab100ada1c724c9f751d9da39602a97 (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.c3
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)
d->chip.mask = intc_disable;
d->chip.unmask = intc_enable;
d->chip.mask_ack = intc_disable;
+ d->chip.enable = intc_enable;
+ d->chip.disable = intc_disable;
+ d->chip.shutdown = intc_disable;
d->chip.set_type = intc_set_sense;
#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)