Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 131836
b: refs/heads/master
c: dca1714
h: refs/heads/master
v: v3
  • Loading branch information
Ben Gardner authored and Linus Torvalds committed Feb 28, 2009
1 parent f15a427 commit 43104a9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 221be177e68e197a946bb991c8b91468e960be4e
refs/heads/master: dca17146f4b72b8966016c406d94ad3e48289b79
7 changes: 6 additions & 1 deletion trunk/drivers/w1/slaves/w1_ds2433.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 43104a9

Please sign in to comment.