Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 108935
b: refs/heads/master
c: d0fd937
h: refs/heads/master
i:
  108933: 90c10bb
  108931: b9a6b77
  108927: 4cb99ed
v: v3
  • Loading branch information
Mike Frysinger authored and Linus Torvalds committed Aug 20, 2008
1 parent f12d123 commit 164eb83
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7f60459921bd24e86b21e07c42244c510b4f46b2
refs/heads/master: d0fd93781c49cbe127f9e7a5b402e9b167c105a6
8 changes: 8 additions & 0 deletions trunk/drivers/rtc/rtc-bfin.c
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ static int __devinit bfin_rtc_probe(struct platform_device *pdev)
struct bfin_rtc *rtc;
struct device *dev = &pdev->dev;
int ret = 0;
unsigned long timeout;

dev_dbg_stamp(dev);

Expand All @@ -377,6 +378,13 @@ static int __devinit bfin_rtc_probe(struct platform_device *pdev)
ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, IRQF_SHARED, pdev->name, dev);
if (unlikely(ret))
goto err;
/* sometimes the bootloader touched things, but the write complete was not
* enabled, so let's just do a quick timeout here since the IRQ will not fire ...
*/
timeout = jiffies + HZ;
while (bfin_read_RTC_ISTAT() & RTC_ISTAT_WRITE_PENDING)
if (time_after(jiffies, timeout))
break;
bfin_rtc_reset(dev, RTC_ISTAT_WRITE_COMPLETE);
bfin_write_RTC_SWCNT(0);

Expand Down

0 comments on commit 164eb83

Please sign in to comment.