diff options
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-davinci.c | 1 | ||||
| -rw-r--r-- | drivers/rtc/rtc-ds1307.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c index 92a8f6cacda9..34647fc1ee98 100644 --- a/drivers/rtc/rtc-davinci.c +++ b/drivers/rtc/rtc-davinci.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/bcd.h> | 29 | #include <linux/bcd.h> |
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <linux/io.h> | 31 | #include <linux/io.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | /* | 34 | /* |
| 34 | * The DaVinci RTC is a simple RTC with the following | 35 | * The DaVinci RTC is a simple RTC with the following |
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index de033b7ac21f..d827ce570a8c 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c | |||
| @@ -777,7 +777,7 @@ static int __devinit ds1307_probe(struct i2c_client *client, | |||
| 777 | 777 | ||
| 778 | read_rtc: | 778 | read_rtc: |
| 779 | /* read RTC registers */ | 779 | /* read RTC registers */ |
| 780 | tmp = ds1307->read_block_data(ds1307->client, 0, 8, buf); | 780 | tmp = ds1307->read_block_data(ds1307->client, ds1307->offset, 8, buf); |
| 781 | if (tmp != 8) { | 781 | if (tmp != 8) { |
| 782 | pr_debug("read error %d\n", tmp); | 782 | pr_debug("read error %d\n", tmp); |
| 783 | err = -EIO; | 783 | err = -EIO; |
| @@ -862,7 +862,7 @@ read_rtc: | |||
| 862 | if (ds1307->regs[DS1307_REG_HOUR] & DS1307_BIT_PM) | 862 | if (ds1307->regs[DS1307_REG_HOUR] & DS1307_BIT_PM) |
| 863 | tmp += 12; | 863 | tmp += 12; |
| 864 | i2c_smbus_write_byte_data(client, | 864 | i2c_smbus_write_byte_data(client, |
| 865 | DS1307_REG_HOUR, | 865 | ds1307->offset + DS1307_REG_HOUR, |
| 866 | bin2bcd(tmp)); | 866 | bin2bcd(tmp)); |
| 867 | } | 867 | } |
| 868 | 868 | ||
