|
Jesse Keating |
7a32965 |
From b4e96f34c17e5a79cd28774cc722bb33e7e02c6e Mon Sep 17 00:00:00 2001
|
|
Jesse Keating |
7a32965 |
From: Peter Jones <pjones@redhat.com>
|
|
Jesse Keating |
7a32965 |
Date: Thu, 25 Sep 2008 16:23:33 -0400
|
|
Jesse Keating |
7a32965 |
Subject: [PATCH] Don't print an error message just because there's no i8042 chip.
|
|
Jesse Keating |
7a32965 |
|
|
Jesse Keating |
7a32965 |
Some systems, such as EFI-based Apple systems, won't necessarily have an
|
|
Jesse Keating |
7a32965 |
i8042 to initialize. We shouldn't be printing an error message in this
|
|
Jesse Keating |
7a32965 |
case, since not detecting the chip is the correct behavior.
|
|
Jesse Keating |
7a32965 |
---
|
|
Jesse Keating |
7a32965 |
drivers/input/serio/i8042.c | 4 +---
|
|
Jesse Keating |
7a32965 |
1 files changed, 1 insertions(+), 3 deletions(-)
|
|
Jesse Keating |
7a32965 |
|
|
Jesse Keating |
7a32965 |
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
|
|
Jesse Keating |
7a32965 |
index 170f71e..4f3e632 100644
|
|
Jesse Keating |
7a32965 |
--- a/drivers/input/serio/i8042.c
|
|
Jesse Keating |
7a32965 |
+++ b/drivers/input/serio/i8042.c
|
|
Jesse Keating |
7a32965 |
@@ -701,10 +701,8 @@ static int __devinit i8042_check_aux(void)
|
|
Jesse Keating |
7a32965 |
|
|
Jesse Keating |
7a32965 |
static int i8042_controller_check(void)
|
|
Jesse Keating |
7a32965 |
{
|
|
Jesse Keating |
7a32965 |
- if (i8042_flush() == I8042_BUFFER_SIZE) {
|
|
Kyle McMartin |
4f86024 |
- pr_err("No controller found\n");
|
|
Jesse Keating |
7a32965 |
+ if (i8042_flush() == I8042_BUFFER_SIZE)
|
|
Jesse Keating |
7a32965 |
return -ENODEV;
|
|
Jesse Keating |
7a32965 |
- }
|
|
Jesse Keating |
7a32965 |
|
|
Jesse Keating |
7a32965 |
return 0;
|
|
Jesse Keating |
7a32965 |
}
|
|
Jesse Keating |
7a32965 |
--
|
|
Jesse Keating |
7a32965 |
1.6.0.1
|
|
Jesse Keating |
7a32965 |
|
|
Jesse Keating |
7a32965 |
Socket fuzzers like sfuzz will trigger this printk a lot, even though it's
|
|
Jesse Keating |
7a32965 |
ratelimited. It isn't particularly useful, so just remove it.
|
|
Jesse Keating |
7a32965 |
|
|
Jesse Keating |
7a32965 |
Signed-off-by: Dave Jones <davej@redhat.com>
|
|
Jesse Keating |
7a32965 |
|
|
Jesse Keating |
7a32965 |
--- linux-2.6.27.noarch/net/can/af_can.c~ 2008-12-11 16:53:48.000000000 -0500
|
|
Jesse Keating |
7a32965 |
+++ linux-2.6.27.noarch/net/can/af_can.c 2008-12-11 16:54:42.000000000 -0500
|
|
Jesse Keating |
7a32965 |
@@ -134,13 +134,9 @@ static int can_create(struct net *net, s
|
|
Jesse Keating |
7a32965 |
err = request_module("can-proto-%d", protocol);
|
|
Jesse Keating |
7a32965 |
|
|
Jesse Keating |
7a32965 |
/*
|
|
Jesse Keating |
7a32965 |
- * In case of error we only print a message but don't
|
|
Jesse Keating |
7a32965 |
- * return the error code immediately. Below we will
|
|
Jesse Keating |
7a32965 |
- * return -EPROTONOSUPPORT
|
|
Jesse Keating |
7a32965 |
+ * In case of error we don't return the error code immediately.
|
|
Jesse Keating |
7a32965 |
+ * Below we will return -EPROTONOSUPPORT
|
|
Jesse Keating |
7a32965 |
*/
|
|
Jesse Keating |
7a32965 |
- if (err && printk_ratelimit())
|
|
Jesse Keating |
7a32965 |
- printk(KERN_ERR "can: request_module "
|
|
Jesse Keating |
7a32965 |
- "(can-proto-%d) failed.\n", protocol);
|
|
Jesse Keating |
7a32965 |
}
|
|
Jesse Keating |
7a32965 |
#endif
|
|
Jesse Keating |
7a32965 |
|
|
Kyle McMartin |
6c1e38b |
This was removed in revision 1.6 of linux-2.6-silence-noise.patch
|
|
Kyle McMartin |
6c1e38b |
in ye olde CVS tree. I have no idea why. Originally the pr_debug in
|
|
Kyle McMartin |
6c1e38b |
device_pm_remove was nuked as well, but that seems to have gotten lost in
|
|
Kyle McMartin |
6c1e38b |
the r1.634 of kernel.spec (2.6.26-rc2-git5.)
|
|
Kyle McMartin |
6c1e38b |
|
|
Kyle McMartin |
6c1e38b |
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
|
|
Kyle McMartin |
6c1e38b |
index 2a52270..bacbdd2 100644
|
|
Kyle McMartin |
6c1e38b |
--- a/drivers/base/power/main.c
|
|
Kyle McMartin |
6c1e38b |
+++ b/drivers/base/power/main.c
|
|
Kyle McMartin |
6c1e38b |
@@ -87,8 +87,6 @@ void device_pm_unlock(void)
|
|
Kyle McMartin |
6c1e38b |
*/
|
|
Kyle McMartin |
6c1e38b |
void device_pm_add(struct device *dev)
|
|
Kyle McMartin |
6c1e38b |
{
|
|
Kyle McMartin |
6c1e38b |
- pr_debug("PM: Adding info for %s:%s\n",
|
|
Kyle McMartin |
6c1e38b |
- dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
|
|
Kyle McMartin |
6c1e38b |
mutex_lock(&dpm_list_mtx);
|
|
Kyle McMartin |
6c1e38b |
if (dev->parent && dev->parent->power.in_suspend)
|
|
Kyle McMartin |
6c1e38b |
dev_warn(dev, "parent %s should not be sleeping\n",
|