@@ -1320,19 +1324,24 @@ static int ds1307_probe(struct i2c_client *client,
ds1307->regs[0] |= DS1337_BIT_INTCN
| bbsqi_bitpos[ds1307->type];
ds1307->regs[0] &= ~(DS1337_BIT_A2IE | DS1337_BIT_A1IE);
+ ds1307->regs[1] &= ~(DS1337_BIT_A2I | DS1337_BIT_A1I);
want_irq = true;
}
- i2c_smbus_write_byte_data(client, DS1337_REG_CONTROL,
- ds1307->regs[0]);
-
/* oscillator fault? clear flag, and warn */
if (ds1307->regs[1] & DS1337_BIT_OSF) {
- i2c_smbus_write_byte_data(client, DS1337_REG_STATUS,
- ds1307->regs[1] & ~DS1337_BIT_OSF);
dev_warn(&client->dev, "SET TIME!\n");
}
+
+ tmp = ds1307->write_block_data(ds1307->client,
+ DS1337_REG_CONTROL, 2, buf);
+ if (tmp != 2) {
+ dev_dbg(&client->dev, "write error %d\n", tmp);
+ err = -EIO;
+ goto exit;
+ }
+
break;
case rx_8025:
When the alarm is used to switch the computer on, the interrupts are disabled, but the interrupt flags are not cleared. When the alarm is set, later, the interrupt is enabled and the interrupt flags are cleared. Unfortunately, at least with my DS1339 chip, it behaves as if the interrupt was enabled before the flag was cleared, so the interrupt is triggered. With this patch, the interrupt flags are cleared when the chip is probed, so an interrupt is not triggered when the alarm is set. Signed-off-by: Nicolas Boullis <nboullis@debian.org> --- Not sure if I should check for errors with (tmp != 2) to be consistent with the check after reading the same block, a few lines above, or with (tmp < 0)...