summaryrefslogtreecommitdiffstats
path: root/drivers/sh
diff options
context:
space:
mode:
authorFrancesco VIRLINZI <francesco.virlinzi@st.com>2009-12-04 08:57:58 +0000
committerPaul Mundt <lethal@linux-sh.org>2009-12-09 12:35:18 +0900
commit87a705dde49d0c482fa818f0923af59ed0954d5d (patch)
tree412bfb76135982dee94e790b459b5e853edbdeda /drivers/sh
parente717cc6c07f006be36e35189aacb28be4e30ad14 (diff)
downloadlinux-stable-87a705dde49d0c482fa818f0923af59ed0954d5d.tar.gz
linux-stable-87a705dde49d0c482fa818f0923af59ed0954d5d.tar.bz2
linux-stable-87a705dde49d0c482fa818f0923af59ed0954d5d.zip
sh: intc: Fixed resume from hibernation
This patch fixes the resume from hibernation in the intc sysdev device when it manages 'redirect' irq Signed-off-by: Francesco Virlinzi <francesco.virlinzi@st.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh')
-rw-r--r--drivers/sh/intc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index a7e5c2e9986c..88f5aaf62fdb 100644
--- a/drivers/sh/intc.c
+++ b/drivers/sh/intc.c
@@ -806,6 +806,8 @@ static int intc_suspend(struct sys_device *dev, pm_message_t state)
if (d->state.event != PM_EVENT_FREEZE)
break;
for_each_irq_desc(irq, desc) {
+ if (desc->handle_irq == intc_redirect_irq)
+ continue
if (desc->chip != &d->chip)
continue;
if (desc->status & IRQ_DISABLED)