67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
|
--- linux-2.6.26.noarch/drivers/base/power/main.c~ 2008-08-22 20:57:57.000000000 -0400
|
||
|
|
+++ linux-2.6.26.noarch/drivers/base/power/main.c 2008-08-22 20:58:05.000000000 -0400
|
||
|
|
@@ -69,9 +69,6 @@ void device_pm_unlock(void)
|
||
|
|
*/
|
||
|
|
void device_pm_add(struct device *dev)
|
||
|
|
{
|
||
|
|
- pr_debug("PM: Adding info for %s:%s\n",
|
||
|
|
- dev->bus ? dev->bus->name : "No Bus",
|
||
|
|
- kobject_name(&dev->kobj));
|
||
|
|
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@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
|
||
|
|
|
||
|
|
Socket fuzzers like sfuzz will trigger this printk a lot, even though it's
|
||
|
|
ratelimited. It isn't particularly useful, so just remove it.
|
||
|
|
|
||
|
|
Signed-off-by: Dave Jones <davej@redhat.com>
|
||
|
|
|
||
|
|
--- linux-2.6.27.noarch/net/can/af_can.c~ 2008-12-11 16:53:48.000000000 -0500
|
||
|
|
+++ linux-2.6.27.noarch/net/can/af_can.c 2008-12-11 16:54:42.000000000 -0500
|
||
|
|
@@ -134,13 +134,9 @@ static int can_create(struct net *net, s
|
||
|
|
err = request_module("can-proto-%d", protocol);
|
||
|
|
|
||
|
|
/*
|
||
|
|
- * In case of error we only print a message but don't
|
||
|
|
- * return the error code immediately. Below we will
|
||
|
|
- * return -EPROTONOSUPPORT
|
||
|
|
+ * In case of error we don't return the error code immediately.
|
||
|
|
+ * Below we will return -EPROTONOSUPPORT
|
||
|
|
*/
|
||
|
|
- if (err && printk_ratelimit())
|
||
|
|
- printk(KERN_ERR "can: request_module "
|
||
|
|
- "(can-proto-%d) failed.\n", protocol);
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
|