44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
|
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
|
||
|
|
Date: Thu, 3 Jun 2010 19:47:18 +0000 (-0600)
|
||
|
|
Subject: PCI: change resource collision messages from KERN_ERR to KERN_INFO
|
||
|
|
X-Git-Tag: v2.6.35-rc3~4^2~3
|
||
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f6d440daebd12be66ea1f834faf2966a49a07bd6
|
||
|
|
|
||
|
|
PCI: change resource collision messages from KERN_ERR to KERN_INFO
|
||
|
|
|
||
|
|
We can often deal with PCI resource issues by moving devices around. In
|
||
|
|
that case, there's no point in alarming the user with messages like these.
|
||
|
|
There are many bug reports where the message itself is the only problem,
|
||
|
|
e.g., https://bugs.launchpad.net/ubuntu/+source/linux/+bug/413419 .
|
||
|
|
|
||
|
|
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
|
||
|
|
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
|
||
|
|
---
|
||
|
|
|
||
|
|
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
|
||
|
|
index 17bed18..92379e2 100644
|
||
|
|
--- a/drivers/pci/setup-res.c
|
||
|
|
+++ b/drivers/pci/setup-res.c
|
||
|
|
@@ -97,16 +97,16 @@ int pci_claim_resource(struct pci_dev *dev, int resource)
|
||
|
|
|
||
|
|
root = pci_find_parent_resource(dev, res);
|
||
|
|
if (!root) {
|
||
|
|
- dev_err(&dev->dev, "no compatible bridge window for %pR\n",
|
||
|
|
- res);
|
||
|
|
+ dev_info(&dev->dev, "no compatible bridge window for %pR\n",
|
||
|
|
+ res);
|
||
|
|
return -EINVAL;
|
||
|
|
}
|
||
|
|
|
||
|
|
conflict = request_resource_conflict(root, res);
|
||
|
|
if (conflict) {
|
||
|
|
- dev_err(&dev->dev,
|
||
|
|
- "address space collision: %pR conflicts with %s %pR\n",
|
||
|
|
- res, conflict->name, conflict);
|
||
|
|
+ dev_info(&dev->dev,
|
||
|
|
+ "address space collision: %pR conflicts with %s %pR\n",
|
||
|
|
+ res, conflict->name, conflict);
|
||
|
|
return -EBUSY;
|
||
|
|
}
|
||
|
|
|