projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pci
/
bus.c
diff --git
a/drivers/pci/bus.c
b/drivers/pci/bus.c
index d3346d23963b87606517b44b15c196ee3393ac4e..89b3befc7155325b12f21d4667a675b52423bb6d 100644
(file)
--- a/
drivers/pci/bus.c
+++ b/
drivers/pci/bus.c
@@
-140,6
+140,8
@@
static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res,
type_mask |= IORESOURCE_TYPE_BITS;
pci_bus_for_each_resource(bus, r, i) {
type_mask |= IORESOURCE_TYPE_BITS;
pci_bus_for_each_resource(bus, r, i) {
+ resource_size_t min_used = min;
+
if (!r)
continue;
if (!r)
continue;
@@
-163,12
+165,12
@@
static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res,
* overrides "min".
*/
if (avail.start)
* overrides "min".
*/
if (avail.start)
- min = avail.start;
+ min
_used
= avail.start;
max = avail.end;
/* Ok, try it out.. */
max = avail.end;
/* Ok, try it out.. */
- ret = allocate_resource(r, res, size, min, max,
+ ret = allocate_resource(r, res, size, min
_used
, max,
align, alignf, alignf_data);
if (ret == 0)
return 0;
align, alignf, alignf_data);
if (ret == 0)
return 0;