aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/w1/w1.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index 33e50310e9e0..7293c9b11f91 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -675,7 +675,6 @@ static void w1_slave_found(void *data, u64 rn)
675 struct w1_slave *sl; 675 struct w1_slave *sl;
676 struct list_head *ent; 676 struct list_head *ent;
677 struct w1_reg_num *tmp; 677 struct w1_reg_num *tmp;
678 int family_found = 0;
679 struct w1_master *dev; 678 struct w1_master *dev;
680 u64 rn_le = cpu_to_le64(rn); 679 u64 rn_le = cpu_to_le64(rn);
681 680
@@ -698,9 +697,6 @@ static void w1_slave_found(void *data, u64 rn)
698 sl->reg_num.crc == tmp->crc) { 697 sl->reg_num.crc == tmp->crc) {
699 set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags); 698 set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
700 break; 699 break;
701 } else if (sl->reg_num.family == tmp->family) {
702 family_found = 1;
703 break;
704 } 700 }
705 701
706 slave_count++; 702 slave_count++;