Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 365796
b: refs/heads/master
c: ad3f3cf
h: refs/heads/master
v: v3
  • Loading branch information
Sachin Kamat authored and Linus Torvalds committed Apr 30, 2013
1 parent 198e221 commit d881bc5
Show file tree
Hide file tree
Showing 2 changed files with 2 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: 569b05a300dc0307ad69aaa5dbe1cf4601bb3af8
refs/heads/master: ad3f3cf489311af25f91bade664a1688896245e9
5 changes: 1 addition & 4 deletions trunk/drivers/rtc/rtc-tps6586x.c
Original file line number Diff line number Diff line change
Expand Up @@ -289,15 +289,12 @@ static int tps6586x_rtc_probe(struct platform_device *pdev)
if (ret < 0) {
dev_err(&pdev->dev, "request IRQ(%d) failed with ret %d\n",
rtc->irq, ret);
goto fail_req_irq;
goto fail_rtc_register;
}
disable_irq(rtc->irq);
device_set_wakeup_capable(&pdev->dev, 1);
return 0;

fail_req_irq:
rtc_device_unregister(rtc->rtc);

fail_rtc_register:
tps6586x_update(tps_dev, RTC_CTRL, 0,
RTC_ENABLE | OSC_SRC_SEL | PRE_BYPASS | CL_SEL_MASK);
Expand Down

0 comments on commit d881bc5

Please sign in to comment.