Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 114922
b: refs/heads/master
c: 9141f57
h: refs/heads/master
v: v3
  • Loading branch information
David Fries authored and Linus Torvalds committed Oct 16, 2008
1 parent 38a08cd commit d9d1595
Show file tree
Hide file tree
Showing 2 changed files with 4 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: cd7b28d33d0cabdc86fa7d546da07b9385274bbb
refs/heads/master: 9141f57c7edd40a48a41b7e31427c4b2831a36af
4 changes: 3 additions & 1 deletion trunk/drivers/w1/w1_int.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#include "w1_int.h"

static u32 w1_ids = 1;
static int w1_search_count = -1; /* Default is continual scan */
module_param_named(search_count, w1_search_count, int, 0);

static int w1_enable_pullup = 1;
module_param_named(enable_pullup, w1_enable_pullup, int, 0);
Expand Down Expand Up @@ -62,8 +64,8 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
dev->initialized = 0;
dev->id = id;
dev->slave_ttl = slave_ttl;
dev->search_count = w1_search_count;
dev->enable_pullup = w1_enable_pullup;
dev->search_count = -1; /* continual scan */

/* 1 for w1_process to decrement
* 1 for __w1_remove_master_device to decrement
Expand Down

0 comments on commit d9d1595

Please sign in to comment.