Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 319951
b: refs/heads/master
c: aa11ec5
h: refs/heads/master
i:
  319949: 75edd1e
  319947: 07025b0
  319943: 9542b9a
  319935: 1cee54b
v: v3
  • Loading branch information
Devendra Naga authored and Linus Torvalds committed Jul 31, 2012
1 parent 3642885 commit 509d739
Show file tree
Hide file tree
Showing 2 changed files with 2 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: 064407f1c0d54ad215927b4c14b3f4e68fa486f4
refs/heads/master: aa11ec593e2c68d57728d2ebb2da265468e410c9
3 changes: 1 addition & 2 deletions trunk/drivers/rtc/rtc-r9701.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,7 @@ static int __devinit r9701_probe(struct spi_device *spi)
* contain invalid values. If so, try to write a default date:
* 2000/1/1 00:00:00
*/
r9701_get_datetime(&spi->dev, &dt);
if (rtc_valid_tm(&dt)) {
if (r9701_get_datetime(&spi->dev, &dt)) {
dev_info(&spi->dev, "trying to repair invalid date/time\n");
dt.tm_sec = 0;
dt.tm_min = 0;
Expand Down

0 comments on commit 509d739

Please sign in to comment.