diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 10:03:21 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 10:04:25 -0400 |
| commit | ffe315012510165ce82e4dd4767f0a5dba9edbf7 (patch) | |
| tree | f601cd980af9d0ced5ca9aedecef4fa0d2ca0e15 /drivers/rtc/rtc-ds1672.c | |
| parent | e2d3a35ee427aaba99b6c68a56609ce276c51270 (diff) | |
| parent | 4a8e43feeac7996b8de2d5b2823e316917493df4 (diff) | |
Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers
UAPI Disintegration 2012-10-09
Conflicts:
MAINTAINERS
arch/arm/configs/bcmring_defconfig
arch/arm/mach-imx/clk-imx51-imx53.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/nand_bcm_umi.h
drivers/mtd/nand/orion_nand.c
Diffstat (limited to 'drivers/rtc/rtc-ds1672.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1672.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c index 7fa67d0df172..45d65c0b3a85 100644 --- a/drivers/rtc/rtc-ds1672.c +++ b/drivers/rtc/rtc-ds1672.c | |||
| @@ -37,8 +37,17 @@ static int ds1672_get_datetime(struct i2c_client *client, struct rtc_time *tm) | |||
| 37 | unsigned char buf[4]; | 37 | unsigned char buf[4]; |
| 38 | 38 | ||
| 39 | struct i2c_msg msgs[] = { | 39 | struct i2c_msg msgs[] = { |
| 40 | {client->addr, 0, 1, &addr}, /* setup read ptr */ | 40 | {/* setup read ptr */ |
| 41 | {client->addr, I2C_M_RD, 4, buf}, /* read date */ | 41 | .addr = client->addr, |
| 42 | .len = 1, | ||
| 43 | .buf = &addr | ||
| 44 | }, | ||
| 45 | {/* read date */ | ||
| 46 | .addr = client->addr, | ||
| 47 | .flags = I2C_M_RD, | ||
| 48 | .len = 4, | ||
| 49 | .buf = buf | ||
| 50 | }, | ||
| 42 | }; | 51 | }; |
| 43 | 52 | ||
| 44 | /* read date registers */ | 53 | /* read date registers */ |
| @@ -99,8 +108,17 @@ static int ds1672_get_control(struct i2c_client *client, u8 *status) | |||
| 99 | unsigned char addr = DS1672_REG_CONTROL; | 108 | unsigned char addr = DS1672_REG_CONTROL; |
| 100 | 109 | ||
| 101 | struct i2c_msg msgs[] = { | 110 | struct i2c_msg msgs[] = { |
| 102 | {client->addr, 0, 1, &addr}, /* setup read ptr */ | 111 | {/* setup read ptr */ |
| 103 | {client->addr, I2C_M_RD, 1, status}, /* read control */ | 112 | .addr = client->addr, |
| 113 | .len = 1, | ||
| 114 | .buf = &addr | ||
| 115 | }, | ||
| 116 | {/* read control */ | ||
| 117 | .addr = client->addr, | ||
| 118 | .flags = I2C_M_RD, | ||
| 119 | .len = 1, | ||
| 120 | .buf = status | ||
| 121 | }, | ||
| 104 | }; | 122 | }; |
| 105 | 123 | ||
| 106 | /* read control register */ | 124 | /* read control register */ |