diff --git a/[refs] b/[refs] index 9204d27c2aa2..bd322f9123b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e717cc6c07f006be36e35189aacb28be4e30ad14 +refs/heads/master: 87a705dde49d0c482fa818f0923af59ed0954d5d diff --git a/trunk/drivers/sh/intc.c b/trunk/drivers/sh/intc.c index a7e5c2e9986c..88f5aaf62fdb 100644 --- a/trunk/drivers/sh/intc.c +++ b/trunk/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)