Merge ../linux-2.6-watchdog-mm

[pandora-kernel.git] / drivers / rtc / rtc-rs5c372.c

diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index bbdad09..a44fe4e 100644 (file)
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -91,7 +91,7 @@ static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm)
        unsigned char buf[8] = { RS5C372_REG_BASE };
 
        dev_dbg(&client->dev,
-               "%s: secs=%d, mins=%d, hours=%d ",
+               "%s: secs=%d, mins=%d, hours=%d "
                "mday=%d, mon=%d, year=%d, wday=%d\n",
                __FUNCTION__, tm->tm_sec, tm->tm_min, tm->tm_hour,
                tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
@@ -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;
 }