Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 283090
b: refs/heads/master
c: 012e52e
h: refs/heads/master
v: v3
  • Loading branch information
Linus Walleij authored and Linus Torvalds committed Jan 11, 2012
1 parent 9971889 commit fab53ea
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: b62581e6241c33b9fef45117f86830058738371f
refs/heads/master: 012e52e15e7ebbc7b08165e8f4b10f71a3e6810b
6 changes: 3 additions & 3 deletions trunk/drivers/rtc/rtc-ab8500.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static int ab8500_rtc_read_time(struct device *dev, struct rtc_time *tm)

/* Early AB8500 chips will not clear the rtc read request bit */
if (abx500_get_chip_id(dev) == 0) {
msleep(1);
usleep_range(1000, 1000);
} else {
/* Wait for some cycles after enabling the rtc read in ab8500 */
while (time_before(jiffies, timeout)) {
Expand All @@ -102,7 +102,7 @@ static int ab8500_rtc_read_time(struct device *dev, struct rtc_time *tm)
if (!(value & RTC_READ_REQUEST))
break;

msleep(1);
usleep_range(1000, 5000);
}
}

Expand Down Expand Up @@ -295,7 +295,7 @@ static int __devinit ab8500_rtc_probe(struct platform_device *pdev)
return err;

/* Wait for reset by the PorRtc */
msleep(1);
usleep_range(1000, 5000);

err = abx500_get_register_interruptible(&pdev->dev, AB8500_RTC,
AB8500_RTC_STAT_REG, &rtc_ctrl);
Expand Down

0 comments on commit fab53ea

Please sign in to comment.