projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
tile
/
kernel
/
pci.c
diff --git
a/arch/tile/kernel/pci.c
b/arch/tile/kernel/pci.c
index
1f80a88
..
f70c789
100644
(file)
--- a/
arch/tile/kernel/pci.c
+++ b/
arch/tile/kernel/pci.c
@@
-178,8
+178,8
@@
int __init tile_pci_init(void)
continue;
hv_cfg_fd1 = tile_pcie_open(i, 1);
if (hv_cfg_fd1 < 0) {
continue;
hv_cfg_fd1 = tile_pcie_open(i, 1);
if (hv_cfg_fd1 < 0) {
- pr_err("PCI: Couldn't open config fd to HV
"
-
"for controller %d\n",
i);
+ pr_err("PCI: Couldn't open config fd to HV
for controller %d\n",
+
i);
goto err_cont;
}
goto err_cont;
}
@@
-423,8
+423,7
@@
int pcibios_enable_device(struct pci_dev *dev, int mask)
for (i = 0; i < 6; i++) {
r = &dev->resource[i];
if (r->flags & IORESOURCE_UNSET) {
for (i = 0; i < 6; i++) {
r = &dev->resource[i];
if (r->flags & IORESOURCE_UNSET) {
- pr_err("PCI: Device %s not available "
- "because of resource collisions\n",
+ pr_err("PCI: Device %s not available because of resource collisions\n",
pci_name(dev));
return -EINVAL;
}
pci_name(dev));
return -EINVAL;
}