rtc-spear: fix for balancing the enable_irq_wake in Power Mgmt

Handle the fix for unbalanced irq for the cases when enable_irq_wake
fails, and a warning related to same is displayed on the console.  The
workaround is handled at the driver level.

Signed-off-by: Deepak Sikri <deepak.sikri@st.com>
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Acked-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
Cc: Shiraz Hashim <shiraz.hashim@st.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Deepak Sikri 2012-03-23 15:02:29 -07:00 committed by Linus Torvalds
parent 0e0cb892a8
commit cd0e08a8c9

View File

@ -80,6 +80,7 @@ struct spear_rtc_config {
struct clk *clk;
spinlock_t lock;
void __iomem *ioaddr;
unsigned int irq_wake;
};
static inline void spear_rtc_clear_interrupt(struct spear_rtc_config *config)
@ -463,9 +464,10 @@ static int spear_rtc_suspend(struct platform_device *pdev, pm_message_t state)
int irq;
irq = platform_get_irq(pdev, 0);
if (device_may_wakeup(&pdev->dev))
enable_irq_wake(irq);
else {
if (device_may_wakeup(&pdev->dev)) {
if (!enable_irq_wake(irq))
config->irq_wake = 1;
} else {
spear_rtc_disable_interrupt(config);
clk_disable(config->clk);
}
@ -481,9 +483,12 @@ static int spear_rtc_resume(struct platform_device *pdev)
irq = platform_get_irq(pdev, 0);
if (device_may_wakeup(&pdev->dev))
disable_irq_wake(irq);
else {
if (device_may_wakeup(&pdev->dev)) {
if (config->irq_wake) {
disable_irq_wake(irq);
config->irq_wake = 0;
}
} else {
clk_enable(config->clk);
spear_rtc_enable_interrupt(config);
}