Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 41075
b: refs/heads/master
c: 17ad78e
h: refs/heads/master
i:
  41073: 3929e98
  41071: feaca11
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Nov 25, 2006
1 parent 86bd037 commit e30a1a1
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: d728b1e69fd5829ec2ab2434381e5a268d4f684a
refs/heads/master: 17ad78e59a0334d64c3a37f964b15ab9918313c7
6 changes: 3 additions & 3 deletions trunk/drivers/rtc/rtc-rs5c372.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ static int rs5c372_get_trim(struct i2c_client *client, int *osc, int *trim)
return -EIO;
}

dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, *trim);

if (osc)
*osc = (buf & RS5C372_TRIM_XSL) ? 32000 : 32768;

if (trim)
if (trim) {
*trim = buf & RS5C372_TRIM_MASK;
dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, *trim);
}

return 0;
}
Expand Down

0 comments on commit e30a1a1

Please sign in to comment.