X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fw1%2Fw1.c;h=7293c9b11f9160e2b80f89e8e9c63d6bdfd6553f;hb=c7843e8f565f624b0cff7cad1370fad4cb84dfbc;hp=33e50310e9e02418763188665457b127f4ae7520;hpb=c60ecec67ab3f6b5791ef49d502b7a61909aa13e;p=linux-2.6 diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 33e50310e9..7293c9b11f 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -675,7 +675,6 @@ static void w1_slave_found(void *data, u64 rn) struct w1_slave *sl; struct list_head *ent; struct w1_reg_num *tmp; - int family_found = 0; struct w1_master *dev; u64 rn_le = cpu_to_le64(rn); @@ -698,9 +697,6 @@ static void w1_slave_found(void *data, u64 rn) sl->reg_num.crc == tmp->crc) { set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags); break; - } else if (sl->reg_num.family == tmp->family) { - family_found = 1; - break; } slave_count++;