From d9d1595e9d9dd86e4663e5946c8dabce50bc152e Mon Sep 17 00:00:00 2001 From: David Fries Date: Wed, 15 Oct 2008 22:04:45 -0700 Subject: [PATCH] --- yaml --- r: 114922 b: refs/heads/master c: 9141f57c7edd40a48a41b7e31427c4b2831a36af h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/w1/w1_int.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b6dc3d35a086..dff6a12ecf76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd7b28d33d0cabdc86fa7d546da07b9385274bbb +refs/heads/master: 9141f57c7edd40a48a41b7e31427c4b2831a36af diff --git a/trunk/drivers/w1/w1_int.c b/trunk/drivers/w1/w1_int.c index 9d723efdf915..3fd6e6651fbe 100644 --- a/trunk/drivers/w1/w1_int.c +++ b/trunk/drivers/w1/w1_int.c @@ -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); @@ -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