git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...
[sfrench/cifs-2.6.git]
/
drivers
/
pci
/
controller
/
pci-versatile.c
diff --git
a/drivers/pci/controller/pci-versatile.c
b/drivers/pci/controller/pci-versatile.c
index 994f32061b325d90d6a790452d61e5b3b0558154..f59ad2728c0b3266c8308e788d25e9c72f8dd96d 100644
(file)
--- a/
drivers/pci/controller/pci-versatile.c
+++ b/
drivers/pci/controller/pci-versatile.c
@@
-82,7
+82,7
@@
static int versatile_pci_parse_request_of_pci_ranges(struct device *dev,
switch (resource_type(res)) {
case IORESOURCE_IO:
- err =
pci_remap_iospace(
res, iobase);
+ err =
devm_pci_remap_iospace(dev,
res, iobase);
if (err) {
dev_warn(dev, "error %d: failed to map resource %pR\n",
err, res);