From 43104a9f7586a0b02d40af18ca28992051865a97 Mon Sep 17 00:00:00 2001 From: Ben Gardner Date: Fri, 27 Feb 2009 14:02:58 -0800 Subject: [PATCH] --- yaml --- r: 131836 b: refs/heads/master c: dca17146f4b72b8966016c406d94ad3e48289b79 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/w1/slaves/w1_ds2433.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 89f74a15258b..3ea2b860c024 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 221be177e68e197a946bb991c8b91468e960be4e +refs/heads/master: dca17146f4b72b8966016c406d94ad3e48289b79 diff --git a/trunk/drivers/w1/slaves/w1_ds2433.c b/trunk/drivers/w1/slaves/w1_ds2433.c index 858c16a544c2..139447148822 100644 --- a/trunk/drivers/w1/slaves/w1_ds2433.c +++ b/trunk/drivers/w1/slaves/w1_ds2433.c @@ -156,6 +156,9 @@ static ssize_t w1_f23_read_bin(struct kobject *kobj, */ 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; }