Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186336
b: refs/heads/master
c: 5a98c04
h: refs/heads/master
v: v3
  • Loading branch information
James Hogan authored and Linus Torvalds committed Mar 6, 2010
1 parent c35c17b commit 2e4808c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9407351d7cce01a9ada942f00201e92e2541d9cb
refs/heads/master: 5a98c04d78c896d52baef20ffc11f6d1ba6eb786
5 changes: 3 additions & 2 deletions trunk/drivers/rtc/rtc-coh901331.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,13 @@ static int coh901331_resume(struct platform_device *pdev)
{
struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);

if (device_may_wakeup(&pdev->dev))
if (device_may_wakeup(&pdev->dev)) {
disable_irq_wake(rtap->irq);
else
} else {
clk_enable(rtap->clk);
writel(rtap->irqmaskstore, rtap->virtbase + COH901331_IRQ_MASK);
clk_disable(rtap->clk);
}
return 0;
}
#else
Expand Down

0 comments on commit 2e4808c

Please sign in to comment.