Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 365799
b: refs/heads/master
c: ad81903
h: refs/heads/master
i:
  365797: 9249663
  365795: 198e221
  365791: c7bef1e
v: v3
  • Loading branch information
Sachin Kamat authored and Linus Torvalds committed Apr 30, 2013
1 parent 16af322 commit 880c467
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: 406dc00407edfa75c97123c7f8653e850358fb72
refs/heads/master: ad819039f1aa5c5179ecdfb035ed2864d93e741e
8 changes: 4 additions & 4 deletions trunk/drivers/rtc/rtc-max77686.c
Original file line number Diff line number Diff line change
Expand Up @@ -551,17 +551,17 @@ static int max77686_rtc_probe(struct platform_device *pdev)
goto err_rtc;
}
virq = irq_create_mapping(max77686->irq_domain, MAX77686_RTCIRQ_RTCA1);
if (!virq)
if (!virq) {
ret = -ENXIO;
goto err_rtc;
}
info->virq = virq;

ret = devm_request_threaded_irq(&pdev->dev, virq, NULL,
max77686_rtc_alarm_irq, 0, "rtc-alarm0", info);
if (ret < 0) {
if (ret < 0)
dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
info->virq, ret);
goto err_rtc;
}

err_rtc:
return ret;
Expand Down

0 comments on commit 880c467

Please sign in to comment.