diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-21 14:11:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-21 14:11:11 -0400 |
| commit | 271dc9ce7f9652e2fe3794871900fef292a9777b (patch) | |
| tree | 809041444563947c9df97e6e7149abf79c9431b6 /drivers | |
| parent | 226a35ef0ef310d8fffa3e6283ee3aab9dab26aa (diff) | |
| parent | f5128514137633ee951b1c484945bec9092c4e99 (diff) | |
Merge branch '2019-06-21-master-imports'
- Assorted small fixes
- Bugfix RSA handling code to reject images with unknown padding.
- Some boards disabled unused features to turn off DM warnings.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci_auto_common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c index 183787333e..84908e6154 100644 --- a/drivers/pci/pci_auto_common.c +++ b/drivers/pci/pci_auto_common.c @@ -21,9 +21,10 @@ void pciauto_region_init(struct pci_region *res) /* * Avoid allocating PCI resources from address 0 -- this is illegal * according to PCI 2.1 and moreover, this is known to cause Linux IDE - * drivers to fail. Use a reasonable starting value of 0x1000 instead. + * drivers to fail. Use a reasonable starting value of 0x1000 instead + * if the bus start address is below 0x1000. */ - res->bus_lower = res->bus_start ? res->bus_start : 0x1000; + res->bus_lower = res->bus_start < 0x1000 ? 0x1000 : res->bus_start; } void pciauto_region_align(struct pci_region *res, pci_size_t size) |