From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 17 Jul 2012 18:46:23 +0000 (-0700)
Subject: 3.0-stable patches
X-Git-Tag: v3.0.38~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=700869c846bfb0cf0165c6e8ab3db32a2ba16f2f;p=thirdparty%2Fkernel%2Fstable-queue.git

3.0-stable patches

added patches:
	arch
	block
	COPYING
	CREDITS
	crypto
	diffstat
	Documentation
	drivers
	firmware
	fs
	hwmon-it87-preserve-configuration-register-bits-on-init.patch
	include
	init
	ipc
	Kbuild
	Kconfig
	kernel
	lib
	MAINTAINERS
	Makefile
	mm
	net
	patch-3.4.5-rc1
	patch-3.4.5-rc1.asc
	README
	REPORTING-BUGS
	samples
	scripts
	security
	sound
	tools
	usr
	virt
---

diff --git a/queue-3.0/hwmon-it87-preserve-configuration-register-bits-on-init.patch b/queue-3.0/hwmon-it87-preserve-configuration-register-bits-on-init.patch
new file mode 100644
index 00000000000..f2cab253958
--- /dev/null
+++ b/queue-3.0/hwmon-it87-preserve-configuration-register-bits-on-init.patch
@@ -0,0 +1,34 @@
+From 41002f8dd5938d5ad1d008ce5bfdbfe47fa7b4e8 Mon Sep 17 00:00:00 2001
+From: Jean Delvare <khali@linux-fr.org>
+Date: Thu, 12 Jul 2012 22:47:37 +0200
+Subject: hwmon: (it87) Preserve configuration register bits on init
+
+From: Jean Delvare <khali@linux-fr.org>
+
+commit 41002f8dd5938d5ad1d008ce5bfdbfe47fa7b4e8 upstream.
+
+We were accidentally losing one bit in the configuration register on
+device initialization. It was reported to freeze one specific system
+right away. Properly preserve all bits we don't explicitly want to
+change in order to prevent that.
+
+Reported-by: Stevie Trujillo <stevie.trujillo@gmail.com>
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+Reviewed-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hwmon/it87.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/hwmon/it87.c
++++ b/drivers/hwmon/it87.c
+@@ -2057,7 +2057,7 @@ static void __devinit it87_init_device(s
+ 
+ 	/* Start monitoring */
+ 	it87_write_value(data, IT87_REG_CONFIG,
+-			 (it87_read_value(data, IT87_REG_CONFIG) & 0x36)
++			 (it87_read_value(data, IT87_REG_CONFIG) & 0x3e)
+ 			 | (update_vbat ? 0x41 : 0x01));
+ }
+ 
diff --git a/queue-3.0/series b/queue-3.0/series
new file mode 100644
index 00000000000..eac4511065e
--- /dev/null
+++ b/queue-3.0/series
@@ -0,0 +1 @@
+hwmon-it87-preserve-configuration-register-bits-on-init.patch