Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 139239
b: refs/heads/master
c: 62da659
h: refs/heads/master
i:
  139237: 733a71f
  139235: 8baa99d
  139231: 4c64e10
v: v3
  • Loading branch information
Roel Kluin authored and Linus Torvalds committed Apr 1, 2009
1 parent 96187db commit cdad458
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: a216685818a54b4f15235068b53908f954850251
refs/heads/master: 62da659a7057f7227a99a42eea6aa606b09c1e8c
4 changes: 2 additions & 2 deletions trunk/drivers/rtc/rtc-wm8350.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ static int wm8350_rtc_settime(struct device *dev, struct rtc_time *tm)
do {
rtc_ctrl = wm8350_reg_read(wm8350, WM8350_RTC_TIME_CONTROL);
schedule_timeout_uninterruptible(msecs_to_jiffies(1));
} while (retries-- && !(rtc_ctrl & WM8350_RTC_STS));
} while (--retries && !(rtc_ctrl & WM8350_RTC_STS));

if (!retries) {
dev_err(dev, "timed out on set confirmation\n");
Expand Down Expand Up @@ -437,7 +437,7 @@ static int wm8350_rtc_probe(struct platform_device *pdev)
do {
timectl = wm8350_reg_read(wm8350,
WM8350_RTC_TIME_CONTROL);
} while (timectl & WM8350_RTC_STS && retries--);
} while (timectl & WM8350_RTC_STS && --retries);

if (retries == 0) {
dev_err(&pdev->dev, "failed to start: timeout\n");
Expand Down

0 comments on commit cdad458

Please sign in to comment.