]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
.25 patches
authorGreg Kroah-Hartman <gregkh@suse.de>
Tue, 30 Sep 2008 23:30:57 +0000 (16:30 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 30 Sep 2008 23:30:57 +0000 (16:30 -0700)
queue-2.6.25/acpi-fix-thermal-shutdowns.patch [new file with mode: 0644]
queue-2.6.25/i2c-dev-return-correct-error-code-on-class_create-failure.patch [new file with mode: 0644]
queue-2.6.25/series

diff --git a/queue-2.6.25/acpi-fix-thermal-shutdowns.patch b/queue-2.6.25/acpi-fix-thermal-shutdowns.patch
new file mode 100644 (file)
index 0000000..72ba3ec
--- /dev/null
@@ -0,0 +1,43 @@
+From cebbert@redhat.com  Tue Sep 30 16:10:41 2008
+From: Milan Broz <mbroz@redhat.com>
+Date: Wed, 3 Sep 2008 19:41:12 -0400
+Subject: ACPI: Fix thermal shutdowns
+To: stable@kernel.org
+Cc: Andi Kleen <ak@linux.intel.com>
+Message-ID: <20080903194112.79d41dbc@redhat.com>
+
+From: Milan Broz <mbroz@redhat.com>
+
+commit 9f497bcc695fb828da023d74ad3c966b1e58ad21 upstream
+
+ACPI: Fix thermal shutdowns
+
+Do not use unsigned int if there is test for negative number...
+
+See drivers/acpi/processor_perflib.c
+  static unsigned int ignore_ppc = -1;
+...
+  if (event == CPUFREQ_START && ignore_ppc <= 0) {
+       ignore_ppc = 0;
+...
+
+Signed-off-by: Milan Broz <mbroz@redhat.com>
+Signed-off-by: Andi Kleen <ak@linux.intel.com>
+Cc: Chuck Ebbert <cebbert@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/acpi/processor_perflib.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/acpi/processor_perflib.c
++++ b/drivers/acpi/processor_perflib.c
+@@ -70,7 +70,7 @@ static DEFINE_MUTEX(performance_mutex);
+  *  0 -> cpufreq low level drivers initialized -> consider _PPC values
+  *  1 -> ignore _PPC totally -> forced by user through boot param
+  */
+-static unsigned int ignore_ppc = -1;
++static int ignore_ppc = -1;
+ module_param(ignore_ppc, uint, 0644);
+ MODULE_PARM_DESC(ignore_ppc, "If the frequency of your machine gets wrongly" \
+                "limited by BIOS, this should help");
diff --git a/queue-2.6.25/i2c-dev-return-correct-error-code-on-class_create-failure.patch b/queue-2.6.25/i2c-dev-return-correct-error-code-on-class_create-failure.patch
new file mode 100644 (file)
index 0000000..4783028
--- /dev/null
@@ -0,0 +1,39 @@
+From khali@linux-fr.org  Tue Sep 30 16:15:33 2008
+From: Sven Wegener <sven.wegener@stealer.net>
+Date: Sun, 28 Sep 2008 14:14:21 +0200
+Subject: i2c-dev: Return correct error code on class_create() failure
+To: stable@kernel.org
+Cc: Sven Wegener <sven.wegener@stealer.net>
+Message-ID: <20080928141421.2a53861e@hyperion.delvare>
+
+
+From: Sven Wegener <sven.wegener@stealer.net>
+
+In Linus' tree:
+http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commit;h=e74783ec3cb981211689bd2cfd3248f8dc48ec01
+
+We need to convert the error pointer from class_create(), else we'll return the
+successful return code from register_chrdev() on failure.
+
+Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/i2c/i2c-dev.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/i2c/i2c-dev.c
++++ b/drivers/i2c/i2c-dev.c
+@@ -574,8 +574,10 @@ static int __init i2c_dev_init(void)
+               goto out;
+       i2c_dev_class = class_create(THIS_MODULE, "i2c-dev");
+-      if (IS_ERR(i2c_dev_class))
++      if (IS_ERR(i2c_dev_class)) {
++              res = PTR_ERR(i2c_dev_class);
+               goto out_unreg_chrdev;
++      }
+       res = i2c_add_driver(&i2cdev_driver);
+       if (res)
index 95385c7f97688ef25f1d19e938339aa60a8d8283..56b813607cd0436ddca6d82f7d43a1442df94dcc 100644 (file)
@@ -3,3 +3,5 @@ pxa2xx_spi-dma-bugfixes.patch
 pxa2xx_spi-chipselect-bugfixes.patch
 drivers-mmc-card-block.c-fix-refcount-leak-in-mmc_block_open.patch
 alsa-hda-fix-model-for-dell-inspiron-1525.patch
+i2c-dev-return-correct-error-code-on-class_create-failure.patch
+acpi-fix-thermal-shutdowns.patch