diff options
author | Andi Kleen <andi@basil.nowhere.org> | 2006-11-28 14:12:29 -0500 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-11-28 14:12:29 -0500 |
commit | a3550a9c543556cf7764be81aeb17c6dab440753 (patch) | |
tree | e8c8bf721cc917c8842c4a007ad4b3f68eb7aa1e /drivers/rtc/rtc-rs5c372.c | |
parent | 9a14f2964b459c18198ee59ff7212321def82df7 (diff) | |
parent | 2ea5814472c3c910aed5c5b60f1f3b1000e353f1 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/rtc/rtc-rs5c372.c')
-rw-r--r-- | drivers/rtc/rtc-rs5c372.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c index 2a86632580f1..a44fe4efa216 100644 --- a/drivers/rtc/rtc-rs5c372.c +++ b/drivers/rtc/rtc-rs5c372.c | |||
@@ -126,13 +126,13 @@ static int rs5c372_get_trim(struct i2c_client *client, int *osc, int *trim) | |||
126 | return -EIO; | 126 | return -EIO; |
127 | } | 127 | } |
128 | 128 | ||
129 | dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, *trim); | ||
130 | |||
131 | if (osc) | 129 | if (osc) |
132 | *osc = (buf & RS5C372_TRIM_XSL) ? 32000 : 32768; | 130 | *osc = (buf & RS5C372_TRIM_XSL) ? 32000 : 32768; |
133 | 131 | ||
134 | if (trim) | 132 | if (trim) { |
135 | *trim = buf & RS5C372_TRIM_MASK; | 133 | *trim = buf & RS5C372_TRIM_MASK; |
134 | dev_dbg(&client->dev, "%s: raw trim=%x\n", __FUNCTION__, *trim); | ||
135 | } | ||
136 | 136 | ||
137 | return 0; | 137 | return 0; |
138 | } | 138 | } |