Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.…

…6 of HEAD * HEAD: [PATCH] w1: remove drivers/w1/w1.h [PATCH] w1: fix idle check loop in ds2482 [PATCH] W1: remove w1 mail list from lm_sensors.
mna · Jul 13, 2006 · 7f0852f · 7f0852f
2 parents 2f1b925 + f01cfb3
commit 7f0852f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 38 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -3180,7 +3180,6 @@ S:	Maintained
 W1 DALLAS'S 1-WIRE BUS
 P:	Evgeniy Polyakov
 M:	[email protected]
-L:	[email protected]
 S:	Maintained
 
 W83L51xD SD/MMC CARD INTERFACE DRIVER

diff --git a/drivers/w1/masters/ds2482.c b/drivers/w1/masters/ds2482.c
@@ -218,7 +218,7 @@ static int ds2482_wait_1wire_idle(struct ds2482_data *pdev)
 		do {
 			temp = i2c_smbus_read_byte(&pdev->client);
 		} while ((temp >= 0) && (temp & DS2482_REG_STS_1WB) &&
-			 (++retries > DS2482_WAIT_IDLE_TIMEOUT));
+			 (++retries < DS2482_WAIT_IDLE_TIMEOUT));
 	}
 
 	if (retries > DS2482_WAIT_IDLE_TIMEOUT)

diff --git a/drivers/w1/w1_io.h b/drivers/w1/w1_io.h