loads of new patches

2 files changed, 96 insertions, 0 deletions

diff --git a/i2c/w1-fix-idle-check-loop-in-ds2482.patch b/i2c/w1-fix-idle-check-loop-in-ds2482.patch
new file mode 100644
index 0000000000000..df3505af7ec42
--- /dev/null
+++ b/i2c/w1-fix-idle-check-loop-in-ds2482.patch
@@ -0,0 +1,33 @@
+From johnpol@2ka.mipt.ru Thu Jun 29 11:33:32 2006
+Date: Thu, 29 Jun 2006 22:33:22 +0400
+From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+To: GregKH <greg@kroah.com>
+Subject: w1: fix idle check loop in ds2482
+Message-ID: <20060629183322.GC2336@2ka.mipt.ru>
+Content-Disposition: inline
+
+From: Ben Gardner <gardner.ben@gmail.com>
+
+The idle check loop has a greater-than where it should have a less-than.
+This causes the ds2482 driver to check for the idle condition exactly
+once, which causes it to fail on faster machines.
+
+Signed-off-by: Ben Gardner <gardner.ben@gmail.com>
+Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/w1/masters/ds2482.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gregkh-2.6.orig/drivers/w1/masters/ds2482.c
++++ gregkh-2.6/drivers/w1/masters/ds2482.c
+@@ -218,7 +218,7 @@ static int ds2482_wait_1wire_idle(struct
+ 		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/i2c/w1-remove-drivers-w1-w1.h.patch b/i2c/w1-remove-drivers-w1-w1.h.patch
new file mode 100644
index 0000000000000..10f2b97456183
--- /dev/null
+++ b/i2c/w1-remove-drivers-w1-w1.h.patch
@@ -0,0 +1,63 @@
+From johnpol@2ka.mipt.ru Wed Jun 28 10:05:38 2006
+Date: Wed, 28 Jun 2006 21:05:31 +0400
+From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+To: GregKH <greg@kroah.com>
+Subject: w1: remove drivers/w1/w1.h
+Message-ID: <20060628170531.GB11892@2ka.mipt.ru>
+Content-Disposition: inline
+
+From: Adrian Bunk <bunk@stusta.de>
+
+drivers/w1/w1_io.h is both a subset of drivers/w1/w1.h and no longer
+#include'd by any file.
+
+This patch therefore removes w1_io.h.
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/w1/w1_io.h |   36 ------------------------------------
+ 1 file changed, 36 deletions(-)
+
+--- gregkh-2.6.orig/drivers/w1/w1_io.h
++++ /dev/null
+@@ -1,36 +0,0 @@
+-/*
+- *	w1_io.h
+- *
+- * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+- *
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+- */
+-
+-#ifndef __W1_IO_H
+-#define __W1_IO_H
+-
+-#include "w1.h"
+-
+-u8 w1_triplet(struct w1_master *dev, int bdir);
+-void w1_write_8(struct w1_master *, u8);
+-int w1_reset_bus(struct w1_master *);
+-u8 w1_calc_crc8(u8 *, int);
+-void w1_write_block(struct w1_master *, const u8 *, int);
+-u8 w1_read_block(struct w1_master *, u8 *, int);
+-void w1_search_devices(struct w1_master *dev, w1_slave_found_callback cb);
+-int w1_reset_select_slave(struct w1_slave *sl);
+-
+-#endif /* __W1_IO_H */