diff options
author | Ingo Molnar | 2009-03-01 12:47:58 +0100 |
---|---|---|
committer | Ingo Molnar | 2009-03-01 12:47:58 +0100 |
commit | 55f2b78995826d549401bdf20abeac1832636bb6 (patch) | |
tree | 931b31f3b6e0879df0f9a1d58ffd040d9a652f2e /drivers/w1/slaves/w1_ds2433.c | |
parent | Revert "gpu/drm, x86, PAT: PAT support for io_mapping_*" (diff) | |
parent | x86: i915 needs pgprot_writecombine() and is_io_mapping_possible() (diff) | |
download | kernel-qcow2-linux-55f2b78995826d549401bdf20abeac1832636bb6.tar.gz kernel-qcow2-linux-55f2b78995826d549401bdf20abeac1832636bb6.tar.xz kernel-qcow2-linux-55f2b78995826d549401bdf20abeac1832636bb6.zip |
Merge branch 'x86/urgent' into x86/pat
Diffstat (limited to 'drivers/w1/slaves/w1_ds2433.c')
-rw-r--r-- | drivers/w1/slaves/w1_ds2433.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c index 858c16a544c2..139447148822 100644 --- a/drivers/w1/slaves/w1_ds2433.c +++ b/drivers/w1/slaves/w1_ds2433.c @@ -156,6 +156,9 @@ out_up: */ static int w1_f23_write(struct w1_slave *sl, int addr, int len, const u8 *data) { +#ifdef CONFIG_W1_SLAVE_DS2433_CRC + struct w1_f23_data *f23 = sl->family_data; +#endif u8 wrbuf[4]; u8 rdbuf[W1_PAGE_SIZE + 3]; u8 es = (addr + len - 1) & 0x1f; @@ -196,7 +199,9 @@ static int w1_f23_write(struct w1_slave *sl, int addr, int len, const u8 *data) /* Reset the bus to wake up the EEPROM (this may not be needed) */ w1_reset_bus(sl->master); - +#ifdef CONFIG_W1_SLAVE_DS2433_CRC + f23->validcrc &= ~(1 << (addr >> W1_PAGE_BITS)); +#endif return 0; } |