diff options
| author | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
| commit | 351516118103c6c7bb5321aa9d5866eb3dc0d5ca (patch) | |
| tree | bf8ecc55d77847ec8299bcf964352bef38121cc5 /drivers/rtc | |
| parent | c37bff78783d40d6e604129135c207e279de902f (diff) | |
| parent | bd842b53fada517017d192c8a12fc9a38e6250e1 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mm/cache-v6.S
Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-rs5c372.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c index 90cf0a6ff23e..dd14e202c2c8 100644 --- a/drivers/rtc/rtc-rs5c372.c +++ b/drivers/rtc/rtc-rs5c372.c @@ -207,7 +207,7 @@ static int rs5c372_get_datetime(struct i2c_client *client, struct rtc_time *tm) static int rs5c372_set_datetime(struct i2c_client *client, struct rtc_time *tm) { struct rs5c372 *rs5c = i2c_get_clientdata(client); - unsigned char buf[8]; + unsigned char buf[7]; int addr; dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d " |