diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-06 00:09:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-06 00:09:14 -0800 |
| commit | 91f7b5c41811154706448b2bf500000cbbfa96ba (patch) | |
| tree | 9a4cdbd7f4863ff5f5a031b9f7ae9f0c89739fa3 /drivers/i2c/chips/m41t00.c | |
| parent | af3e095a1fb42bac32355d5d59ce93f8b4e59a3e (diff) | |
| parent | 81ffbc04a8ea06c4bea534154f49ed598013ee6b (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c/m41t00: Do not forget to write year
i2c-mv64xxx: Fix random oops at boot
i2c: Migration aids for i2c_adapter.dev removal
i2c-pnx: Add entry to MAINTAINERS
i2c-pnx: Fix interrupt handler, get rid of EARLY config option
Diffstat (limited to 'drivers/i2c/chips/m41t00.c')
| -rw-r--r-- | drivers/i2c/chips/m41t00.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c index 420377c8642..3fcb646e207 100644 --- a/drivers/i2c/chips/m41t00.c +++ b/drivers/i2c/chips/m41t00.c @@ -209,6 +209,7 @@ m41t00_set(void *arg) buf[m41t00_chip->hour] = (buf[m41t00_chip->hour] & ~0x3f) | (hour& 0x3f); buf[m41t00_chip->day] = (buf[m41t00_chip->day] & ~0x3f) | (day & 0x3f); buf[m41t00_chip->mon] = (buf[m41t00_chip->mon] & ~0x1f) | (mon & 0x1f); + buf[m41t00_chip->year] = year; if (i2c_master_send(save_client, wbuf, 9) < 0) dev_err(&save_client->dev, "m41t00_set: Write error\n"); |