diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-08-05 16:39:29 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-08-05 16:39:29 +0200 |
| commit | f2701b77bbd992f3df4631de8493f21db0830452 (patch) | |
| tree | b05b2bf8b47002ae81c79aaa9de2a311b8ee075e /drivers/pci/of.c | |
| parent | x86/KVM/VMX: Don't set l1tf_flush_l1d from vmx_handle_external_intr() (diff) | |
| parent | Linux 4.18-rc7 (diff) | |
| download | linux-f2701b77bbd992f3df4631de8493f21db0830452.tar.xz linux-f2701b77bbd992f3df4631de8493f21db0830452.zip | |
Merge 4.18-rc7 into master to pick up the KVM dependcy
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/pci/of.c')
| -rw-r--r-- | drivers/pci/of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/of.c b/drivers/pci/of.c index d088c9147f10..69a60d6ebd73 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -612,7 +612,7 @@ int 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); |