rpms/kernel/devel kernel.spec, 1.983, 1.984 linux-2.6-silence-noise.patch, 1.20, 1.21

[Peter Jones]

Author: pjones

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27574

Modified Files:
	kernel.spec linux-2.6-silence-noise.patch 
Log Message:
* Thu Sep 25 2008 Peter Jones <pjones at redhat.com>
- Remove i8042 "No controller found." noise.



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.983
retrieving revision 1.984
diff -u -r1.983 -r1.984
--- kernel.spec	25 Sep 2008 19:58:13 -0000	1.983
+++ kernel.spec	25 Sep 2008 20:36:21 -0000	1.984
@@ -1733,6 +1733,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Sep 25 2008 Peter Jones <pjones at redhat.com>
+- Remove i8042 "No controller found." noise.
+
 * Thu Sep 25 2008 Dave Jones <davej at redhat.com>
 - Disable noisy ALSA debug spew.
 

linux-2.6-silence-noise.patch:

Index: linux-2.6-silence-noise.patch
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/linux-2.6-silence-noise.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linux-2.6-silence-noise.patch	23 Aug 2008 01:01:21 -0000	1.20
+++ linux-2.6-silence-noise.patch	25 Sep 2008 20:36:21 -0000	1.21
@@ -10,3 +10,34 @@
  	mutex_lock(&dpm_list_mtx);
  	if (dev->parent) {
  		if (dev->parent->power.status >= DPM_SUSPENDING)
+From b4e96f34c17e5a79cd28774cc722bb33e7e02c6e Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Thu, 25 Sep 2008 16:23:33 -0400
+Subject: [PATCH] Don't print an error message just because there's no i8042 chip.
+
+Some systems, such as EFI-based Apple systems, won't necessarily have an
+i8042 to initialize.  We shouldn't be printing an error message in this
+case, since not detecting the chip is the correct behavior.
+---
+ drivers/input/serio/i8042.c |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
+index 170f71e..4f3e632 100644
+--- a/drivers/input/serio/i8042.c
++++ b/drivers/input/serio/i8042.c
+@@ -701,10 +701,8 @@ static int __devinit i8042_check_aux(void)
+ 
+ static int i8042_controller_check(void)
+ {
+-	if (i8042_flush() == I8042_BUFFER_SIZE) {
+-		printk(KERN_ERR "i8042.c: No controller found.\n");
++	if (i8042_flush() == I8042_BUFFER_SIZE)
+ 		return -ENODEV;
+-	}
+ 
+ 	return 0;
+ }
+-- 
+1.6.0.1
+