diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-08-20 13:22:24 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-08-20 13:22:24 -0400 |
commit | 6a91557e4cd508858eca5aba5406a9109861d4de (patch) | |
tree | c57990ccc4a28a9933db2aebba1006f46c619f44 /input-silence-i8042-noise.patch | |
parent | a99be7d4cf2fae68a0562a7687d89ee61c6b9f98 (diff) | |
download | kernel-6a91557e4cd508858eca5aba5406a9109861d4de.tar.gz kernel-6a91557e4cd508858eca5aba5406a9109861d4de.tar.xz kernel-6a91557e4cd508858eca5aba5406a9109861d4de.zip |
Patch file cleanup
Do a couple things here:
- Split the mega-patches into individual patches. Should help with rebasing.
- Make all patches 'git am' acceptable.
There should be no functional or actual code differences from before
Diffstat (limited to 'input-silence-i8042-noise.patch')
-rw-r--r-- | input-silence-i8042-noise.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/input-silence-i8042-noise.patch b/input-silence-i8042-noise.patch new file mode 100644 index 000000000..2dac82a70 --- /dev/null +++ b/input-silence-i8042-noise.patch @@ -0,0 +1,66 @@ +From 10da76f4101b3dd43dcf9cbb6c9c7b6d6f92c829 Mon Sep 17 00:00:00 2001 +From: Peter Jones <pjones@redhat.com> +Date: Thu, 25 Sep 2008 16:23:33 -0400 +Subject: [PATCH] input: silence i8042 noise + +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. + +Bugzilla: N/A +Upstream-status: Fedora mustard +--- + drivers/base/power/main.c | 2 -- + drivers/input/serio/i8042.c | 1 - + net/can/af_can.c | 8 ++------ + 3 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c +index b67d9aef9fe4..dd58b0fdaafd 100644 +--- a/drivers/base/power/main.c ++++ b/drivers/base/power/main.c +@@ -122,8 +122,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", dev_name(dev)); + mutex_lock(&dpm_list_mtx); + if (dev->parent && dev->parent->power.is_prepared) + dev_warn(dev, "parent %s should not be sleeping\n", +diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c +index 3807c3e971cc..612f855c340f 100644 +--- a/drivers/input/serio/i8042.c ++++ b/drivers/input/serio/i8042.c +@@ -857,7 +857,6 @@ static int __init i8042_check_aux(void) + static int i8042_controller_check(void) + { + if (i8042_flush()) { +- pr_err("No controller found\n"); + return -ENODEV; + } + +diff --git a/net/can/af_can.c b/net/can/af_can.c +index ce82337521f6..a3fee4becc93 100644 +--- a/net/can/af_can.c ++++ b/net/can/af_can.c +@@ -158,13 +158,9 @@ static int can_create(struct net *net, struct socket *sock, int protocol, + 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 but don't return the error code immediately. ++ * Below we will return -EPROTONOSUPPORT + */ +- if (err) +- printk_ratelimited(KERN_ERR "can: request_module " +- "(can-proto-%d) failed.\n", protocol); + + cp = can_get_proto(protocol); + } +-- +1.9.3 + |