diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-21 10:56:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-21 10:56:05 +0200 |
| commit | cfb0276373dfb5dccef0f60df0d1f7c0328918a7 (patch) | |
| tree | 65c96cea2a3463baa2eb91351e5333ef44945fbd /drivers/pci/of.c | |
| parent | 04d72afa34edd14d99db7536d22819cdbb2b2e4c (diff) | |
| parent | 13311e74253fe64329390df80bed3f07314ddd61 (diff) | |
Merge tag 'v5.13-rc7' into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pci/of.c')
| -rw-r--r-- | drivers/pci/of.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 85dcb7097da4..a143b02b2dcd 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -353,6 +353,8 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev, dev_warn(dev, "More than one I/O resource converted for %pOF. CPU base address for old range lost!\n", dev_node); *io_base = range.cpu_addr; + } else if (resource_type(res) == IORESOURCE_MEM) { + res->flags &= ~IORESOURCE_MEM_64; } pci_add_resource_offset(resources, res, res->start - range.pci_addr); |