Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361670
b: refs/heads/master
c: 925e8ea
h: refs/heads/master
v: v3
  • Loading branch information
Ashish Jangam authored and Linus Torvalds committed Mar 22, 2013
1 parent 0528035 commit 97e5913
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 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: f9228b204f789493117e458d2fefae937edb7272
refs/heads/master: 925e8ea6bca2c9a590565634b27768d7042e089f
8 changes: 3 additions & 5 deletions trunk/drivers/rtc/rtc-da9052.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,9 @@ static int da9052_rtc_probe(struct platform_device *pdev)

rtc->da9052 = dev_get_drvdata(pdev->dev.parent);
platform_set_drvdata(pdev, rtc);
rtc->irq = platform_get_irq_byname(pdev, "ALM");
ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,
da9052_rtc_irq,
IRQF_TRIGGER_LOW | IRQF_ONESHOT,
"ALM", rtc);
rtc->irq = DA9052_IRQ_ALARM;
ret = da9052_request_irq(rtc->da9052, rtc->irq, "ALM",
da9052_rtc_irq, rtc);
if (ret != 0) {
rtc_err(rtc->da9052, "irq registration failed: %d\n", ret);
return ret;
Expand Down

0 comments on commit 97e5913

Please sign in to comment.